From e0542740f98686e0ce13c216c967874d605c5afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Thu, 5 Dec 2024 14:31:45 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BF=83=E8=B7=B3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A3=8E=E6=9C=BA=E9=80=9A=E8=AE=AF=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/das/modules/node/command/HeartbeatCommand.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java b/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java
index 5c13d899..e29915c9 100644
--- a/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java
+++ b/das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java
@@ -56,13 +56,13 @@ public class HeartbeatCommand implements BaseCommand{
                     }
                     //判断是不是风机
                     String keyPLCDeviceStatus = String.format("RT:%d:iturbineoperationmode", deviceId);
-                    String keyDeviceStatus = String.format("RT:%d:commfaultstate");
+                    String keyCommFaultState = String.format("RT:%d:commfaultstate");
                     Integer plcDeviceStatus = adminRedisTemplate.get(keyPLCDeviceStatus);
                     if (plcDeviceStatus == null){
-                        adminRedisTemplate.set(keyDeviceStatus, online ? 1 : 0);
+                        adminRedisTemplate.set(keyCommFaultState, online ? 0 : 1);
                     }
                     else{
-                        adminRedisTemplate.set(keyDeviceStatus, online && plcDeviceStatus == 1 ? 1 : 0);
+                        adminRedisTemplate.set(keyCommFaultState, online && plcDeviceStatus != 0 ? 0 : 1);
                     }
                 }
             }

From 70b34b409d879d1f00ff5e38fe7a091de37e0cdb Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Thu, 5 Dec 2024 14:33:13 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/dashboard.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index b73c4296..b54cfca2 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -422,10 +422,6 @@ const createScroll = () => {
         if (scrollRef.value.clientWidth + scrollRef.value.scrollLeft == scrollRef.value.scrollWidth) {
             scrollRef.value.scrollLeft = 0
         }
-        //scrollRef.value.scrollTop += 1
-       /* if (scrollRef.value.clientHeight + scrollRef.value.scrollTop == scrollRef.value.scrollHeight) {
-            scrollRef.value.scrollTop = 0
-        }*/
     }, 30);
 }
 
@@ -520,7 +516,7 @@ $labelHeight: 30px;
     }
     .content-number {
         color: #333333;
-        font-size: 28px;
+        font-size: 24px;
     }
     .homelabel {
         font-family: PingFangSC-Semibold;

From 037183003f00c8d61b867b60cfd3d6c48089d68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 5 Dec 2024 14:45:26 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=BD=95=E6=B3=A2?=
 =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E9=99=A4log=20=E8=AE=BE=E5=A4=87:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=A7=84=E5=88=99=E5=9E=8B=E5=8F=B7=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=9C=A8=E6=9C=BA=E7=BB=84=E4=B8=8B=E4=B8=BA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BB=96=E4=B8=BA=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/equipmentManagement/index.vue   | 41 ++++++++++++++-----
 .../src/views/backend/malfunction/index.vue   |  2 -
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 6507eda8..e331b391 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -118,15 +118,21 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
-                                <el-input disabled v-model="editDeviceData.madeinFactory" placeholder="请选择规格型号" clearable />
+                                <el-input :disabled="hasShowSelect" v-model="editDeviceData.madeinFactory" placeholder="请选择规格型号" clearable />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
-                                <!-- <el-input v-model="editDeviceData.model" style="width: 200px" placeholder="请输入规格型号" clearable /> -->
-                                <el-select v-model="editDeviceData.model" placeholder="请选择规格型号" style="width: 200px" @change="selectEditModel">
+                                <el-select
+                                    v-if="hasShowSelect"
+                                    v-model="editDeviceData.model"
+                                    placeholder="请选择规格型号"
+                                    style="width: 200px"
+                                    @change="selectEditModel"
+                                >
                                     <el-option v-for="item in modelList" :key="item.model" :value="item.model"></el-option>
                                 </el-select>
+                                <el-input v-else v-model="editDeviceData.model" style="width: 200px" placeholder="请输入规格型号" clearable />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -287,14 +293,26 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
-                                <el-input disabled v-model="editAddDeviceData.madeinFactory" placeholder="请选择规格型号" clearable />
+                                <el-input
+                                    :disabled="hasShowSelect"
+                                    v-model="editAddDeviceData.madeinFactory"
+                                    placeholder="请选择规格型号"
+                                    clearable
+                                />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
-                                <el-select v-model="editAddDeviceData.model" placeholder="请选择规格型号" style="width: 200px" @change="selectAddModel">
+                                <el-select
+                                    v-if="hasShowSelect"
+                                    v-model="editAddDeviceData.model"
+                                    placeholder="请选择规格型号"
+                                    style="width: 200px"
+                                    @change="selectAddModel"
+                                >
                                     <el-option v-for="item in modelList" :key="item.model" :value="item.model"></el-option>
                                 </el-select>
+                                <el-input v-else v-model="editAddDeviceData.model" placeholder="请输入规格型号" style="width: 200px"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -471,7 +489,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, nextTick, watch } from 'vue'
+import { ref, reactive, computed, onMounted, nextTick, watch } from 'vue'
 import { Search, CirclePlusFilled, Upload, Download } from '@element-plus/icons-vue'
 import {
     equipTree,
@@ -734,13 +752,16 @@ const editDeviceData = reactive({
     nominalCapacity: null,
 })
 
+const hasShowSelect = computed(() => {
+    return queryParameter.value.equipmentTypeId === 10002
+})
 const modelList = ref<{ model: string; madeinFactory: string }[]>([])
 
 const getModelList = () => {
     theoreticalpowerCurveList().then((res) => {
         if (res.rows) {
-            console.log(res);
-            
+            console.log(res)
+
             modelList.value = (res.rows as any[]).map((item: any) => {
                 return {
                     model: item.model,
@@ -750,10 +771,10 @@ const getModelList = () => {
         }
     })
 }
-const selectEditModel = (value:string)=>{
+const selectEditModel = (value: string) => {
     editDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
 }
-const selectAddModel = (value:string)=>{
+const selectAddModel = (value: string) => {
     editAddDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
 }
 const size = ref<'default' | 'large' | 'small'>('default')
diff --git a/ui/dasadmin/src/views/backend/malfunction/index.vue b/ui/dasadmin/src/views/backend/malfunction/index.vue
index 9dcb51c0..b823a6ba 100644
--- a/ui/dasadmin/src/views/backend/malfunction/index.vue
+++ b/ui/dasadmin/src/views/backend/malfunction/index.vue
@@ -323,8 +323,6 @@ const pageSetting = reactive({
 const changePageSetting = () => {}
 
 const getListForAirBlower = () => {
-    console.log(activeName.value)
-
     const data = {
         deviceCode: curTreeData.value.code,
         startTime: dayjs(searchData.date[0]).format('YYYY-MM'),

From 6229b1b4c786cb609e4a1a0fe561b569aa2368ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 5 Dec 2024 14:47:04 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=9A=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/equipment/equipmentManagement/index.vue      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index e331b391..3c617488 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -118,7 +118,12 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
-                                <el-input :disabled="hasShowSelect" v-model="editDeviceData.madeinFactory" placeholder="请选择规格型号" clearable />
+                                <el-input
+                                    :disabled="hasShowSelect"
+                                    v-model="editDeviceData.madeinFactory"
+                                    :placeholder="hasShowSelect ? '请选择规格型号' : '请输入生产厂家'"
+                                    clearable
+                                />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -296,7 +301,7 @@
                                 <el-input
                                     :disabled="hasShowSelect"
                                     v-model="editAddDeviceData.madeinFactory"
-                                    placeholder="请选择规格型号"
+                                    :placeholder="hasShowSelect ? '请选择规格型号' : '请输入生产厂家'"
                                     clearable
                                 />
                             </el-form-item>

From bf7e1bb5bac27d7f0ee60ebf10f04a5a8611ce38 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Thu, 5 Dec 2024 15:04:18 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/mapper/SysIotModelMapper.java   |  2 +-
 .../service/impl/SysEquipmentServiceImpl.java | 26 ++++++++++++++-----
 .../resources/mapper/SysIotModelMapper.xml    |  2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java
index a76a6510..71fad7fd 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java
@@ -19,7 +19,7 @@ public interface SysIotModelMapper extends BaseMapper<SysIotModel> {
 
     List<SysIotModelServiceExcel> queryServiceByModelId(Long id);
 
-    Long queryIotModelIdByName(String code);
+    Long queryIotModelIdByCode(String code);
 
     List<SysIotModelVo> getSysIotModelByType(Integer objectType);
 
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 86d9d1f3..80b14e14 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
@@ -2,12 +2,14 @@ package com.das.modules.equipment.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 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.constant.EquipmentTypeIds;
 import com.das.common.exceptions.ServiceException;
 import com.das.common.utils.BeanCopyUtils;
 import com.das.common.utils.PageDataInfo;
@@ -41,6 +43,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.rmi.ServerException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -249,10 +252,19 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         List<SysEquipment> delSysEquipmentList = new ArrayList<>();
         // 遍历
         for (List<Object> row : list) {
+            if (ObjectUtil.isAllNotEmpty(row.get(4),row.get(1),row.get(5))){
+                throw new ServerException("请检查必填参数："+row);
+            }
+            if (!Integer.valueOf(row.get(1).toString()).equals(EquipmentTypeIds.EQUIPMENT_TYPE_STATION_WTG) && !Integer.valueOf(row.get(1).toString()).equals(EquipmentTypeIds.EQUIPMENT_TYPE_WIND_FARM)){
+                throw new ServerException("设备类型编码错误"+ row.get(1));
+            }
             SysEquipment field = new SysEquipment();
             // 根据编码获取物模型id
             if (StringUtils.hasText(row.get(2).toString())) {
-                Long iotModelId = sysIotModelMapper.queryIotModelIdByName(row.get(3).toString());
+                Long iotModelId = sysIotModelMapper.queryIotModelIdByCode(row.get(2).toString());
+                if (iotModelId == null){
+                    throw new ServerException("物模型编码错误，错误编码："+ row.get(2).toString());
+                }
                 field.setIotModelId(iotModelId);
             }
             if (StringUtils.hasText(row.get(13).toString())) {
@@ -263,9 +275,9 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
             field.setObjectType(Integer.valueOf(row.get(1).toString()));
             field.setCode(row.get(4).toString());
             field.setName(row.get(5).toString());
-            field.setMadeinFactory(row.get(6).toString());
-            field.setModel(row.get(7).toString());
-            field.setLocation(row.get(8).toString());
+            field.setMadeinFactory(ObjectUtil.isEmpty(row.get(6)) ? null : row.get(6).toString());
+            field.setModel(ObjectUtil.isEmpty(row.get(7)) ? null : row.get(7).toString());
+            field.setLocation(ObjectUtil.isEmpty(row.get(8)) ? null : row.get(8).toString());
             if (StringUtils.hasText(row.get(9).toString())) {
                 field.setLongitude(Double.valueOf(row.get(9).toString()));
             }
@@ -276,9 +288,9 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
             if (StringUtils.hasText(row.get(11).toString())) {
                 field.setInstallDate(sf.parse(row.get(11).toString()));
             }
-            field.setRemarks(row.get(12).toString());
-            field.setBelongLine(row.get(17).toString());
-            field.setStandard(Integer.valueOf(row.get(18).toString()));
+            field.setRemarks(ObjectUtil.isEmpty(row.get(12)) ? null : row.get(12).toString());
+            field.setBelongLine(ObjectUtil.isEmpty(row.get(17)) ? null : row.get(17).toString());
+            field.setStandard(ObjectUtil.isEmpty(row.get(18)) ? null : Integer.valueOf(row.get(18).toString()));
             if (StringUtils.hasText(row.get(19).toString())) {
                 field.setNominalCapacity(Double.valueOf(row.get(19).toString()));
             }
diff --git a/das/src/main/resources/mapper/SysIotModelMapper.xml b/das/src/main/resources/mapper/SysIotModelMapper.xml
index e930c439..271248f8 100644
--- a/das/src/main/resources/mapper/SysIotModelMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelMapper.xml
@@ -45,7 +45,7 @@
         where sims.iot_model_id = #{id} order by sims.porder asc
     </select>
 
-    <select id="queryIotModelIdByName" resultType="java.lang.Long">
+    <select id="queryIotModelIdByCode" resultType="java.lang.Long">
         select id from sys_iot_model where iot_model_code = #{code}
     </select>
 

From a25df85d17a4052caaacad396158043e28a25908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Thu, 5 Dec 2024 15:11:23 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0offsetDate,=20=20avgv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calc/functions/FunctionAvgValue.java      | 76 +++++++++++++++++++
 .../calc/functions/FunctionOffsetDate.java    | 60 +++++++++++++++
 .../das/modules/calc/service/CalcService.java |  6 ++
 .../das/modules/data/service/DataService.java |  6 +-
 .../modules/data/service/TDEngineService.java | 48 ++++++++++++
 .../data/service/impl/DataServiceImpl.java    | 26 ++++++-
 6 files changed, 216 insertions(+), 6 deletions(-)
 create mode 100644 das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
 create mode 100644 das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java

diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java b/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
new file mode 100644
index 00000000..68742ee6
--- /dev/null
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java
@@ -0,0 +1,76 @@
+package com.das.modules.calc.functions;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
+import com.das.modules.cache.domain.DeviceInfoCache;
+import com.das.modules.cache.service.CacheService;
+import com.das.modules.data.service.DataService;
+import com.googlecode.aviator.runtime.function.AbstractFunction;
+import com.googlecode.aviator.runtime.type.AviatorNil;
+import com.googlecode.aviator.runtime.type.AviatorObject;
+import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * Aviator扩展函数  - 获取时间维度内平均
+ * 函数格式: avg(deviceId, attr, timedim)
+ * timedim: day - 天， month - 月， year - 年
+ * 返回值：数值，  nil - 获取错误
+ */
+@Slf4j
+public class FunctionAvgValue extends AbstractFunction {
+
+    private DataService dataService = null;
+    private CacheService cacheService = null;
+
+
+    public FunctionAvgValue(DataService dataService, CacheService cacheService) {
+        this.dataService = dataService;
+        this.cacheService = cacheService;
+    }
+
+    @Override
+    public String getName() {
+        return "avgv";
+    }
+
+    @Override
+    public AviatorObject call(Map<String, Object> env, AviatorObject deviceCode, AviatorObject attr) {
+        //设备Code
+        String code = (String)deviceCode.getValue(env);
+        String attrName = (String)attr.getValue(env);
+
+        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheByCode(code);
+        if (deviceInfoCache == null) {
+            return AviatorNil.NIL;
+        }
+        Double value = dataService.getTimeAvgValue(deviceInfoCache.getDeviceId(), attrName, null, null);
+        if (value == null){
+            return AviatorNil.NIL;
+        }
+        //未找到缓存，查询时序API获取数据
+        return AviatorRuntimeJavaType.valueOf(value);
+    }
+    @Override
+    public AviatorObject call(Map<String, Object> env, AviatorObject deviceCode, AviatorObject attr, AviatorObject startTimeData, AviatorObject endTimeData) {
+        //设备Code
+        String code = (String)deviceCode.getValue(env);
+        String attrName = (String)attr.getValue(env);
+        Date startTime = (Date)startTimeData.getValue(env);
+        Date endTime = (Date)endTimeData.getValue(env);
+        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheByCode(code);
+        if (deviceInfoCache == null) {
+            return AviatorNil.NIL;
+        }
+        Double value = dataService.getTimeSumValue(deviceInfoCache.getDeviceId(), attrName, startTime.getTime(), endTime.getTime());
+        if (value == null){
+            return AviatorNil.NIL;
+        }
+        //未找到缓存，查询时序API获取数据
+        return AviatorRuntimeJavaType.valueOf(value);
+    }
+
+}
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java b/das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java
new file mode 100644
index 00000000..67582de4
--- /dev/null
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionOffsetDate.java
@@ -0,0 +1,60 @@
+package com.das.modules.calc.functions;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
+import com.googlecode.aviator.runtime.function.AbstractFunction;
+import com.googlecode.aviator.runtime.type.AviatorObject;
+import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * Aviator扩展函数  - 获取时间维度的起始时间
+ * 函数格式: beginOf(Date, TimeDim)
+ *
+ */
+@Slf4j
+public class FunctionOffsetDate extends AbstractFunction {
+
+    public FunctionOffsetDate() {
+    }
+
+    @Override
+    public String getName() {
+        return "offsetDate";
+    }
+
+    @Override
+    public AviatorObject call(Map<String, Object> env, AviatorObject dateData, AviatorObject dimData, AviatorObject offsetData) {
+        Date date = (Date) dateData.getValue(env);
+        String dim = (String) dimData.getValue(env);
+        Integer offset = (Integer) offsetData.getValue(env);
+
+        Date result = null;
+        switch (dim) {
+            case "day":
+                result = DateUtil.offset(date, DateField.DAY_OF_MONTH, offset);
+                break;
+            case "month":
+                result = DateUtil.offset(date, DateField.MONTH, offset);
+                break;
+            case "year":
+                result = DateUtil.offset(date, DateField.YEAR, offset);
+                break;
+            case "hour":
+                result = DateUtil.offset(date, DateField.HOUR, offset);
+                break;
+            case "minute":
+                result = DateUtil.offset(date, DateField.MINUTE, offset);
+                break;
+            case "second":
+                result = DateUtil.offset(date, DateField.SECOND, offset);
+                break;
+            default:
+                log.error("不支持的维度: {}", dim);
+        }
+        return AviatorRuntimeJavaType.valueOf(result);
+    }
+}
diff --git a/das/src/main/java/com/das/modules/calc/service/CalcService.java b/das/src/main/java/com/das/modules/calc/service/CalcService.java
index af47fab7..0e291a3b 100644
--- a/das/src/main/java/com/das/modules/calc/service/CalcService.java
+++ b/das/src/main/java/com/das/modules/calc/service/CalcService.java
@@ -128,6 +128,12 @@ public class CalcService {
 
         FunctionEndOfDate endOfDate = new FunctionEndOfDate();
         aviator.addFunction(endOfDate);
+
+        FunctionAvgValue avgValue = new FunctionAvgValue(dataService, cacheService);
+        aviator.addFunction(avgValue);
+
+        FunctionOffsetDate offsetDate = new FunctionOffsetDate();
+        aviator.addFunction(offsetDate);
     }
 
     /**
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 cf2a2d96..7628653f 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
@@ -17,6 +17,8 @@ public interface DataService {
 
     void updateCalFieldData(List<CalculateRTData> values);
 
-    Double getTimeTopValue(Long devcieId, String attr, Long startTime, Long endTime);
-    Double getTimeSumValue(Long devcieId, String attr, Long startTime, Long endTime);
+    Double getTimeTopValue(Long deviceId, String attr, Long startTime, Long endTime);
+    Double getTimeSumValue(Long deviceId, String attr, Long startTime, Long endTime);
+
+    Double getTimeAvgValue(Long deviceId, String attrName,  Long startTime, Long endTime);
 }
diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
index be7da2d3..639eb10b 100644
--- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java
+++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
@@ -905,4 +905,52 @@ public class TDEngineService {
         }
         return result;
     }
+
+    public Double getTimeAvgValue(String tableName, String attr, Long startTime, Long endTime) {
+        StringBuffer sb = new StringBuffer(256);
+        sb.append("select ");
+        sb.append("avg(");
+        sb.append(attr);
+        sb.append(")");
+        sb.append(" from ");
+        sb.append(tableName);
+        if (startTime != null && endTime != null) {
+            sb.append(" where ");
+            sb.append(String.format(" updatetime >= %d and updatetime < %d ", startTime, endTime));
+        }
+        Double result = 0.0;
+        try (Connection conn = hikariDataSource.getConnection();
+             Statement smt = conn.createStatement();
+             ResultSet rs = smt.executeQuery(sb.toString())) {
+            if (rs.next()) {
+                result = rs.getDouble(1);
+            }
+        } catch (Exception e) {
+            log.error("获取数据异常",e);
+        }
+        return result;
+    }
+
+    public Double getTimeAvgCalcValue(String tableName, String attr, Long startTime, Long endTime) {
+        StringBuffer sb = new StringBuffer(256);
+        sb.append("select ");
+        sb.append("avg(datavalue)");
+        sb.append(" from ");
+        sb.append(tableName);
+        if (startTime != null && endTime != null) {
+            sb.append(" where ");
+            sb.append(String.format(" updatetime >= %d and updatetime < %d ", startTime, endTime));
+        }
+        Double result = 0.0;
+        try (Connection conn = hikariDataSource.getConnection();
+             Statement smt = conn.createStatement();
+             ResultSet rs = smt.executeQuery(sb.toString())) {
+            if (rs.next()) {
+                result = rs.getDouble(1);
+            }
+        } catch (Exception e) {
+            log.error("获取数据异常",e);
+        }
+        return result;
+    }
 }
diff --git a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
index 9e8dac56..2b9995d6 100644
--- a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
+++ b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
@@ -268,8 +268,8 @@ public class DataServiceImpl implements DataService {
      * @return
      */
     @Override
-    public Double getTimeTopValue(Long devcieId, String attr, Long startTime, Long endTime){
-        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(devcieId);
+    public Double getTimeTopValue(Long deviceId, String attr, Long startTime, Long endTime){
+        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(deviceId);
         if (deviceInfoCache == null) {
             return null;
         }
@@ -285,8 +285,8 @@ public class DataServiceImpl implements DataService {
     }
 
     @Override
-    public Double getTimeSumValue(Long devcieId, String attr, Long startTime, Long endTime) {
-        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(devcieId);
+    public Double getTimeSumValue(Long deviceId, String attr, Long startTime, Long endTime) {
+        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(deviceId);
         if (deviceInfoCache == null) {
             return null;
         }
@@ -301,4 +301,22 @@ public class DataServiceImpl implements DataService {
         }
         return tdEngineService.getTimeSumValue(tableName, attr, startTime, endTime);
     }
+
+    @Override
+    public Double getTimeAvgValue(Long deviceId, String attr, Long startTime, Long endTime) {
+        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(deviceId);
+        if (deviceInfoCache == null) {
+            return null;
+        }
+        String tableName = "";
+        if (cacheService.getIotModelCache().isCalculate(deviceInfoCache.getIotModelId(), attr)){
+            tableName = String.format("c_%s_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
+            return tdEngineService.getTimeAvgCalcValue(tableName, attr, startTime, endTime);
+        } else if (cacheService.getIotModelCache().isHighSpeed(deviceInfoCache.getIotModelId(), attr.toLowerCase())){
+            tableName = String.format("h_%s", deviceInfoCache.getDeviceId());
+        } else if (cacheService.getIotModelCache().isLowSpeed(deviceInfoCache.getIotModelId(), attr.toLowerCase())){
+            tableName = String.format("l_%s", deviceInfoCache.getDeviceId(), attr.toLowerCase());
+        }
+        return tdEngineService.getTimeAvgValue(tableName, attr, startTime, endTime);
+    }
 }

From 700375a64c2788e5f02931c0aeb07ec7a7897155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Thu, 5 Dec 2024 15:51:43 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/controller/WindSpeedCorrectController.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/das/src/main/java/com/das/modules/page/controller/WindSpeedCorrectController.java b/das/src/main/java/com/das/modules/page/controller/WindSpeedCorrectController.java
index 51cf4393..b05a57eb 100644
--- a/das/src/main/java/com/das/modules/page/controller/WindSpeedCorrectController.java
+++ b/das/src/main/java/com/das/modules/page/controller/WindSpeedCorrectController.java
@@ -23,25 +23,25 @@ import java.text.ParseException;
 public class WindSpeedCorrectController {
 
     @Autowired
-    private WindSpeedCorrectService sysEquipmentService;
+    private WindSpeedCorrectService windSpeedCorrectService;
 
     /**  导入  */
     @PostMapping("/import")
     public R<Void> importWindSpeedCorrect( @RequestParam("file") MultipartFile file) throws IOException, ParseException {
-        sysEquipmentService.importWindSpeedCorrect( file);
+        windSpeedCorrectService.importWindSpeedCorrect( file);
         return R.success("导入成功");
     }
     /**  获取风机风速功率修正系数列表  */
     @PostMapping("/getList")
     public R<PageDataInfo<SysPowerCurveFactorVo>> getList(@RequestBody SysPowerCurveFactorDto dto) {
-        PageDataInfo<SysPowerCurveFactorVo> list = sysEquipmentService.getList(dto);
+        PageDataInfo<SysPowerCurveFactorVo> list = windSpeedCorrectService.getList(dto);
         return R.success(list);
     }
 
     /** 导出 */
     @PostMapping("/export")
     public void exportWindSpeedCorrect(@RequestBody SysPowerCurveFactorDto dto, HttpServletRequest request, HttpServletResponse response) {
-        sysEquipmentService.exportWindSpeedCorrect(dto,request, response);
+        windSpeedCorrectService.exportWindSpeedCorrect(dto,request, response);
     }
 
 

From 6c6f6eef43d3aba5e67d1056e53377860c282251 Mon Sep 17 00:00:00 2001
From: geting <13585118195@163.com>
Date: Thu, 5 Dec 2024 16:27:15 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue b/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue
index 354b45ed..e7953bee 100644
--- a/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue
+++ b/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue
@@ -613,6 +613,7 @@ const handleCurrentChange = (val: any) => {
     getpowerCurve()
     getFaultRecording()
     getRunLog()
+    getfaultCodeDict()
 }
 const getpowerCurve = () => {
     currentRow.value = currentRow.value ?? theoreticalTableData.value[0]

From fe312b8d061249b3ef1c0c827bb5953224cde0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 5 Dec 2024 16:41:33 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E5=8D=95=E9=A3=8E=E6=9C=BA=EF=BC=9A?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=9E=9A=E4=B8=BE=20=E9=87=8F=E6=B5=8B?=
 =?UTF-8?q?=EF=BC=9A=E6=95=85=E9=9A=9C=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/WindBlower/index.vue    | 21 +++-------------
 .../backend/equipment/airBlower/utils.ts      | 14 ++++++++++-
 .../equipment/equipmentManagement/index.vue   | 10 ++++++--
 .../equipmentManagement/measurement.vue       | 25 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index e4e92d28..d270d7b1 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -327,7 +327,7 @@ import { useRoute, useRouter } from 'vue-router'
 import Overview from './overview.vue'
 import { TableInstance } from 'element-plus'
 import { dayjs, ElMessage, ElMessageBox } from 'element-plus'
-import { getRealTimeState, getCutDecimalsValue } from '/@/views/backend/equipment/airBlower/utils'
+import { getRealTimeState, getCutDecimalsValue, malFunctionKeys } from '/@/views/backend/equipment/airBlower/utils'
 import { sendCommandReq, sendManualCommandReq } from '/@/api/backend/control/request'
 import { getAlarmListReq } from '/@/api/backend/alarms/request'
 import { queryfaultCodeDict } from '/@/api/backend/theoreticalpowerCurve/request'
@@ -1037,7 +1037,7 @@ const createRealTimeData = async () => {
                 val = enumStore.data[item.attributeCode][val]
             }
             if (malFunctionKeys.includes(item.attributeCode)) {
-                val = malFunctionEnums?.[item.attributeCode] ?? val
+                val = malFunctionEnums?.[val] ?? val
             }
             if (sigleDataKeys.includes(item.attributeCode.toLowerCase())) {
                 realTimeDataForSingle.value[item.attributeCode.toLowerCase()] = val === '-' ? val : val
@@ -1345,29 +1345,16 @@ const getAlarmList = () => {
     })
 }
 
-const malFunctionKeys = [
-    'ActiveStatusCode01',
-    'ActiveStatusCode02',
-    'ActiveStatusCode03',
-    'ActiveStatusCode04',
-    'ActiveStatusCode05',
-    'ActiveStatusCode06',
-    'ActiveStatusCode07',
-    'ActiveStatusCode08',
-    'FirstTriggeredCode',
-]
-
-const malFunctionEnums: any = {}
+let malFunctionEnums: any = {}
 const getMalfunctionEnums = () => {
     const curWindBlower = airBlowerList.value.find((item) => item.irn === route.query.irn)
-    console.log(curWindBlower)
-
     queryfaultCodeDict({ madeinfactory: curWindBlower!.madeinfactory, model: curWindBlower!.model }).then((res) => {
         if (res.code == 200) {
             const data: any = {}
             res.data.forEach((item: any) => {
                 data[item.code] = item.description
             })
+            malFunctionEnums = data
         }
     })
 }
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts b/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts
index 2300b0f7..ba5be2e8 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts
@@ -35,4 +35,16 @@ export const getEnumToValue = (key: string, value: any) => {
     } else {
         return value
     }
-}
\ No newline at end of file
+}
+
+export const malFunctionKeys = [
+    'ActiveStatusCode01',
+    'ActiveStatusCode02',
+    'ActiveStatusCode03',
+    'ActiveStatusCode04',
+    'ActiveStatusCode05',
+    'ActiveStatusCode06',
+    'ActiveStatusCode07',
+    'ActiveStatusCode08',
+    'FirstTriggeredCode',
+]
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 3c617488..1b96fd15 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -487,6 +487,8 @@
                     :iotModelId="measureData.iotModelId"
                     :autoUpdate="measureData.autoUpdate"
                     :attributeType="measureData.measureType"
+                    :madein-factory="measureData.madeinFactory"
+                    :model="measureData.model"
                 ></MeasurementPage>
             </div>
         </el-dialog>
@@ -765,8 +767,6 @@ const modelList = ref<{ model: string; madeinFactory: string }[]>([])
 const getModelList = () => {
     theoreticalpowerCurveList().then((res) => {
         if (res.rows) {
-            console.log(res)
-
             modelList.value = (res.rows as any[]).map((item: any) => {
                 return {
                     model: item.model,
@@ -1060,16 +1060,22 @@ const measureData = reactive<{
     iotModelId: string
     autoUpdate: boolean
     measureType: ModelAttributeType
+    madeinFactory:string
+    model:string
 }>({
     deviceId: '',
     iotModelId: '',
     autoUpdate: false,
     measureType: 138,
+    madeinFactory:'',
+    model:''
 })
 const showMeasure = ref(false)
 const openMeasure = (data: any) => {
     measureData.deviceId = data.row.id
     measureData.iotModelId = data.row.iotModelId
+    measureData.madeinFactory = data.row.madeinFactory
+    measureData.model = data.row.model
     if (measureData.iotModelId) {
         showMeasure.value = true
     } else {
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
index 23e52612..0f31f27b 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
@@ -89,16 +89,21 @@ import { getModelAttributeListReq, getRealValueListReq } from '/@/api/backend/de
 import * as echarts from 'echarts'
 import { getRealValueRangeReq } from '/@/api/backend/deviceModel/request'
 import { useEnumStore } from '/@/stores/enums'
+import { queryfaultCodeDict } from '/@/api/backend/theoreticalpowerCurve/request'
+import { malFunctionKeys} from '/@/views/backend/equipment/airBlower/utils'
+
 const enumStore = useEnumStore()
 
 const props = withDefaults(
-    defineProps<{ iotModelId: string; deviceId: string; show: boolean; autoUpdate: boolean; attributeType: ModelAttributeType }>(),
+    defineProps<{ iotModelId: string; deviceId: string; show: boolean; autoUpdate: boolean; attributeType: ModelAttributeType;model:string;madeinFactory:string }>(),
     {
         iotModelId: '',
         deviceId: '',
         show: false,
         autoUpdate: false,
         attributeType: 138,
+        model:'',
+        madeinFactory:''
     }
 )
 
@@ -204,6 +209,20 @@ const getRealValueList = (data: { deviceId: string; attributes: string[] }, list
     })
 }
 
+let malFunctionEnums: any = {}
+const getMalfunctionEnums = () => {
+    queryfaultCodeDict({ madeinfactory: props.madeinFactory, model: props.model }).then((res) => {
+        if (res.code == 200) {
+            const data: any = {}
+            res.data.forEach((item: any) => {                
+                data[item.code] = item.description
+            })
+            malFunctionEnums = data
+        }
+    })
+}
+
+
 const getCompleteData = () => {
     getAttributeList()
         .then(({ data, codeList }: any) => {
@@ -217,6 +236,9 @@ const getCompleteData = () => {
                 if (enumStore.keys.includes(item.attributeCode)) {
                     realValItem = enumStore.data[item.attributeCode][realValItem]
                 }
+                if(malFunctionKeys.includes(item.attributeCode)){
+                    realValItem = malFunctionEnums?.[realValItem] ?? realValItem
+                }
                 return {
                     ...item,
                     realTimeValue: realValItem
@@ -505,6 +527,7 @@ watch(
     (newVal) => {
         if (newVal) {
             getCompleteData()
+            getMalfunctionEnums()
             searchOptions.datePickerValue = shortcuts[0].value()
         } else {
             autoUpdateTimer.value && clearInterval(autoUpdateTimer.value)

From ec17854c8ceb6076f5f63ae1a18473af9f443f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 5 Dec 2024 17:08:43 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=9A=E6=9C=BA?=
 =?UTF-8?q?=E7=BB=84=E9=A2=9D=E5=AE=9A=E5=AE=B9=E9=87=8F=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/equipmentManagement/index.vue   | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 1b96fd15..9c75668a 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -119,9 +119,9 @@
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
                                 <el-input
-                                    :disabled="hasShowSelect"
+                                    :disabled="hasSetOfMachines"
                                     v-model="editDeviceData.madeinFactory"
-                                    :placeholder="hasShowSelect ? '请选择规格型号' : '请输入生产厂家'"
+                                    :placeholder="hasSetOfMachines ? '请选择规格型号' : '请输入生产厂家'"
                                     clearable
                                 />
                             </el-form-item>
@@ -129,7 +129,7 @@
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
                                 <el-select
-                                    v-if="hasShowSelect"
+                                    v-if="hasSetOfMachines"
                                     v-model="editDeviceData.model"
                                     placeholder="请选择规格型号"
                                     style="width: 200px"
@@ -226,11 +226,12 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
+                            <el-form-item :label="hasSetOfMachines ? '额定容量(MW):' : '装机容量(MW):'">
                                 <el-input-number
+                                    :disabled="hasSetOfMachines"
                                     style="width: 200px"
                                     :controls="false"
-                                    :placeholder="editDeviceData.objectType == '风电场' ? '请输入装机容量' : '请输入额定容量'"
+                                    :placeholder="hasSetOfMachines ? '请输入额定容量' : '请输入装机容量'"
                                     v-model="editDeviceData.nominalCapacity"
                                 />
                             </el-form-item>
@@ -299,9 +300,9 @@
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
                                 <el-input
-                                    :disabled="hasShowSelect"
+                                    :disabled="hasSetOfMachines"
                                     v-model="editAddDeviceData.madeinFactory"
-                                    :placeholder="hasShowSelect ? '请选择规格型号' : '请输入生产厂家'"
+                                    :placeholder="hasSetOfMachines ? '请选择规格型号' : '请输入生产厂家'"
                                     clearable
                                 />
                             </el-form-item>
@@ -309,7 +310,7 @@
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
                                 <el-select
-                                    v-if="hasShowSelect"
+                                    v-if="hasSetOfMachines"
                                     v-model="editAddDeviceData.model"
                                     placeholder="请选择规格型号"
                                     style="width: 200px"
@@ -411,11 +412,12 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editAddDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
+                            <el-form-item :label="hasSetOfMachines ? '额定容量(MW):' : '装机容量(MW):'">
                                 <el-input-number
+                                    :disabled="hasSetOfMachines"
                                     style="width: 200px"
                                     :controls="false"
-                                    :placeholder="editAddDeviceData.objectType == '风电场' ? '请输入装机容量' : '请输入额定容量'"
+                                    :placeholder="hasSetOfMachines ? '请输入额定容量' : '请输入装机容量'"
                                     v-model="editAddDeviceData.nominalCapacity"
                                 />
                             </el-form-item>
@@ -733,7 +735,7 @@ const addDeviceList = () => {
     editAddDeviceData.iotModelId = ''
     editAddDeviceData.belongLine = ''
     editAddDeviceData.standard = 0
-    editAddDeviceData.nominalCapacity = null
+    editAddDeviceData.nominalCapacity = ''
 }
 
 // 查看设备详情
@@ -756,13 +758,13 @@ const editDeviceData = reactive({
     id: '',
     belongLine: '',
     standard: 0,
-    nominalCapacity: null,
+    nominalCapacity: '',
 })
 
-const hasShowSelect = computed(() => {
+const hasSetOfMachines = computed(() => {
     return queryParameter.value.equipmentTypeId === 10002
 })
-const modelList = ref<{ model: string; madeinFactory: string }[]>([])
+const modelList = ref<{ model: string; madeinFactory: string; nominalCapacity: string }[]>([])
 
 const getModelList = () => {
     theoreticalpowerCurveList().then((res) => {
@@ -771,6 +773,7 @@ const getModelList = () => {
                 return {
                     model: item.model,
                     madeinFactory: item.madeinfactory,
+                    nominalCapacity: item.nominalCapacity,
                 }
             })
         }
@@ -778,9 +781,11 @@ const getModelList = () => {
 }
 const selectEditModel = (value: string) => {
     editDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
+    editDeviceData.nominalCapacity = modelList.value.find((item) => item.model == value)?.nominalCapacity || ''
 }
 const selectAddModel = (value: string) => {
     editAddDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
+    editAddDeviceData.nominalCapacity = modelList.value.find((item) => item.model == value)?.nominalCapacity || ''
 }
 const size = ref<'default' | 'large' | 'small'>('default')
 
@@ -938,7 +943,7 @@ const editAddDeviceData = reactive({
     iotModelId: '',
     belongLine: '',
     standard: 0,
-    nominalCapacity: null,
+    nominalCapacity: '',
 })
 const addhandleSwitchChange = (value: any) => {
     editAddDeviceData.standard = value ? 1 : 0
@@ -1060,15 +1065,15 @@ const measureData = reactive<{
     iotModelId: string
     autoUpdate: boolean
     measureType: ModelAttributeType
-    madeinFactory:string
-    model:string
+    madeinFactory: string
+    model: string
 }>({
     deviceId: '',
     iotModelId: '',
     autoUpdate: false,
     measureType: 138,
-    madeinFactory:'',
-    model:''
+    madeinFactory: '',
+    model: '',
 })
 const showMeasure = ref(false)
 const openMeasure = (data: any) => {

From 2d9179f0af357ba034927692821a4e5c37198133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Thu, 5 Dec 2024 17:16:45 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E4=B8=BA=E9=A3=8E=E9=80=9F=E7=B3=BB?=
 =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cache/domain/WindSpeedCoefValue.java      | 11 +++++
 .../modules/cache/service/CacheService.java   |  2 +
 .../das/modules/cache/service/CalcCache.java  |  8 ++++
 .../cache/service/impl/CacheServiceImpl.java  |  9 ++++
 .../cache/service/impl/CalcCacheImpl.java     | 45 +++++++++++++++++++
 .../impl/WindSpeedCorrectServiceImpl.java     | 14 ++++++
 6 files changed, 89 insertions(+)
 create mode 100644 das/src/main/java/com/das/modules/cache/domain/WindSpeedCoefValue.java
 create mode 100644 das/src/main/java/com/das/modules/cache/service/CalcCache.java
 create mode 100644 das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java

diff --git a/das/src/main/java/com/das/modules/cache/domain/WindSpeedCoefValue.java b/das/src/main/java/com/das/modules/cache/domain/WindSpeedCoefValue.java
new file mode 100644
index 00000000..8e901644
--- /dev/null
+++ b/das/src/main/java/com/das/modules/cache/domain/WindSpeedCoefValue.java
@@ -0,0 +1,11 @@
+package com.das.modules.cache.domain;
+
+import lombok.Data;
+
+@Data
+public class WindSpeedCoefValue {
+    private Double minValue;
+    private Double maxValue;
+    private Double coef;
+    private Double base;
+}
diff --git a/das/src/main/java/com/das/modules/cache/service/CacheService.java b/das/src/main/java/com/das/modules/cache/service/CacheService.java
index 9298c642..5784e2ab 100644
--- a/das/src/main/java/com/das/modules/cache/service/CacheService.java
+++ b/das/src/main/java/com/das/modules/cache/service/CacheService.java
@@ -16,4 +16,6 @@ public interface CacheService {
      * @return
      */
     IotModelCache getIotModelCache();
+
+    CalcCache getCalcCache();
 }
diff --git a/das/src/main/java/com/das/modules/cache/service/CalcCache.java b/das/src/main/java/com/das/modules/cache/service/CalcCache.java
new file mode 100644
index 00000000..883143f4
--- /dev/null
+++ b/das/src/main/java/com/das/modules/cache/service/CalcCache.java
@@ -0,0 +1,8 @@
+package com.das.modules.cache.service;
+
+import com.das.modules.cache.domain.WindSpeedCoefValue;
+
+public interface CalcCache {
+    WindSpeedCoefValue getWindSpeedCoef(Long deviceId);
+    void putWindSpeedCoef(Long deviceId, WindSpeedCoefValue windSpeedCoefValue);
+}
diff --git a/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java
index e22d5972..3042f7bd 100644
--- a/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java
+++ b/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java
@@ -1,6 +1,7 @@
 package com.das.modules.cache.service.impl;
 
 import com.das.modules.cache.service.CacheService;
+import com.das.modules.cache.service.CalcCache;
 import com.das.modules.cache.service.EquipmentCache;
 import com.das.modules.cache.service.IotModelCache;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,9 @@ public class CacheServiceImpl implements CacheService {
     @Autowired
     IotModelCache iotModelCache;
 
+    @Autowired
+    CalcCache calcCache;
+
     @Override
     public EquipmentCache getEquipmentCache() {
         return equipmentCache;
@@ -25,5 +29,10 @@ public class CacheServiceImpl implements CacheService {
         return iotModelCache;
     }
 
+    @Override
+    public CalcCache getCalcCache() {
+        return calcCache;
+    }
+
 
 }
diff --git a/das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java
new file mode 100644
index 00000000..748a0198
--- /dev/null
+++ b/das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java
@@ -0,0 +1,45 @@
+package com.das.modules.cache.service.impl;
+
+import com.das.modules.cache.domain.WindSpeedCoefValue;
+import com.das.modules.cache.service.CalcCache;
+import com.das.modules.page.domian.dto.SysPowerCurveFactorDto;
+import com.das.modules.page.domian.vo.SysPowerCurveFactorVo;
+import com.das.modules.page.mapper.SysPowerCurveFactorMapper;
+import jakarta.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+public class CalcCacheImpl implements CalcCache {
+
+    @Autowired
+    SysPowerCurveFactorMapper sysPowerCurveFactorMapper;
+
+    private ConcurrentHashMap<Long, WindSpeedCoefValue> windSpeedCoefMap = new ConcurrentHashMap<>();
+
+    @PostConstruct
+    private void init(){
+        List<SysPowerCurveFactorVo> sysPowerCurveFactorVos = sysPowerCurveFactorMapper.querySysPowerCurveFactorList(new SysPowerCurveFactorDto());
+        for (SysPowerCurveFactorVo sysPowerCurveFactorVo : sysPowerCurveFactorVos) {
+            WindSpeedCoefValue windSpeedCoefValue = new WindSpeedCoefValue();
+            windSpeedCoefValue.setMinValue(sysPowerCurveFactorVo.getSpeedMin());
+            windSpeedCoefValue.setMaxValue(sysPowerCurveFactorVo.getSpeedMax());
+            windSpeedCoefValue.setCoef(sysPowerCurveFactorVo.getFactorK());
+            windSpeedCoefValue.setBase(sysPowerCurveFactorVo.getFactorB());
+            windSpeedCoefMap.put(sysPowerCurveFactorVo.getTurbineId(), windSpeedCoefValue);
+        }
+    }
+
+    @Override
+    public WindSpeedCoefValue getWindSpeedCoef(Long deviceId) {
+        return windSpeedCoefMap.get(deviceId);
+    }
+
+    @Override
+    public void putWindSpeedCoef(Long deviceId, WindSpeedCoefValue windSpeedCoefValue) {
+        windSpeedCoefMap.put(deviceId, windSpeedCoefValue);
+    }
+}
diff --git a/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java
index c355fc00..02cd903b 100644
--- a/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java
+++ b/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java
@@ -12,6 +12,8 @@ import com.das.common.utils.BeanCopyUtils;
 import com.das.common.utils.PageDataInfo;
 import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.vo.SysUserVo;
+import com.das.modules.cache.domain.WindSpeedCoefValue;
+import com.das.modules.cache.service.CacheService;
 import com.das.modules.equipment.entity.SysEquipment;
 import com.das.modules.equipment.mapper.SysEquipmentMapper;
 import com.das.modules.page.domian.dto.IntervalDto;
@@ -52,6 +54,9 @@ public class WindSpeedCorrectServiceImpl implements WindSpeedCorrectService {
     @Autowired
     private SysPowerCurveFactorMapper sysPowerCurveFactorMapper;
 
+    @Autowired
+    private CacheService cacheService;
+
     @Override
     public void importWindSpeedCorrect(MultipartFile file) throws IOException {
         // 通过文件获取输入流
@@ -90,6 +95,15 @@ public class WindSpeedCorrectServiceImpl implements WindSpeedCorrectService {
         }
         //批量插入数据库
         sysPowerCurveFactorMapper.insertBatch(listData);
+        //更新缓存数据
+        listData.forEach(sysPowerCurveFactor -> {
+            WindSpeedCoefValue windSpeedCoefValue = new WindSpeedCoefValue();
+            windSpeedCoefValue.setMaxValue(sysPowerCurveFactor.getSpeedMax());
+            windSpeedCoefValue.setMinValue(sysPowerCurveFactor.getSpeedMin());
+            windSpeedCoefValue.setCoef(sysPowerCurveFactor.getFactorK());
+            windSpeedCoefValue.setBase(sysPowerCurveFactor.getFactorB());
+            cacheService.getCalcCache().putWindSpeedCoef(sysPowerCurveFactor.getTurbineId(),windSpeedCoefValue);
+        });
     }
 
     @Override

From 718dcf45c66ba4579486d9f61634d2941b500a4c Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Thu, 5 Dec 2024 17:32:53 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B8=83=E5=B1=80=E5=92=8C=E9=A3=8E=E6=9C=BA=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=E5=8A=A0=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/dashboard/overview07.png       | Bin 0 -> 9543 bytes
 .../src/assets/dashboard/overview08.png       | Bin 0 -> 9993 bytes
 ui/dasadmin/src/views/backend/dashboard.vue   | 244 ++++++++++++------
 .../src/views/backend/home/windMatrix.vue     | 119 ++++++++-
 4 files changed, 281 insertions(+), 82 deletions(-)
 create mode 100644 ui/dasadmin/src/assets/dashboard/overview07.png
 create mode 100644 ui/dasadmin/src/assets/dashboard/overview08.png

diff --git a/ui/dasadmin/src/assets/dashboard/overview07.png b/ui/dasadmin/src/assets/dashboard/overview07.png
new file mode 100644
index 0000000000000000000000000000000000000000..754d6cded7e79506db190e71f0a5952aaee3b253
GIT binary patch
literal 9543
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

literal 0
HcmV?d00001

diff --git a/ui/dasadmin/src/assets/dashboard/overview08.png b/ui/dasadmin/src/assets/dashboard/overview08.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c0223bf309373b423cab453ae516aeda7cd0885
GIT binary patch
literal 9993
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
TYbJYI00000NkvXXu0mjfcGWYl

literal 0
HcmV?d00001

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index b54cfca2..9862e03c 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -3,79 +3,114 @@
         <el-row style="margin: 0px;">
             <el-col :md="24" :lg="24" class="col-top">
                 <el-row class="overview">
-                    <el-col :xs="12" :sm="8" :md="8" :lg="4">
+                    <el-col :xs="24" :sm="24" :md="24" :lg="16">
                         <div class="overviewItem" style="margin-left: 0px;">
-                            <img class="small-panel-pic" src="~assets/dashboard/overview01.png" alt="" />
-                            <div class="small-base">
-                                <div class="small-title">全场平均风速</div>
-                                <div class="small-value">
-                                    <span class="content-number">{{realData.attributeMap.windfarmavgwindspeed}}</span>
-                                    <span>m/s</span>
-                                </div>
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :xs="12" :sm="8" :md="8" :lg="4">
-                        <div class="overviewItem">
-                            <img class="small-panel-pic" src="~assets/dashboard/overview02.png" alt="" />
-                            <div class="small-base">
-                                <div class="small-title">全场实时有功</div>
-                                <div class="small-value">
-                                    <span class="content-number">{{realData.attributeMap.windfarmactivepower}}</span>
-                                    <span>kW</span>
-                                </div>
-                            </div>
-                        </div>
-                    </el-col>
+                            <el-col :xs="1" :sm="1" :md="1" :lg="1">
+                                <img class="small-panel-pic" src="~assets/dashboard/overview07.png" alt="" />
+                            </el-col>
 
-                    <el-col :xs="12" :sm="8" :md="8" :lg="4">
-                        <div class="overviewItem">
-                            <img class="small-panel-pic" src="~assets/dashboard/overview03.png" alt="" />
-                            <div class="small-base">
-                                <div class="small-title">全场实时无功</div>
-                                <div class="small-value">
-                                    <span class="content-number">{{realData.attributeMap.windfarmreactivepower}}</span>
-                                    <span>kvar</span>
-                                </div>
-                            </div>
-                        </div>
-                    </el-col>
+                            <el-col :xs="4" :sm="3" :md="3" :lg="3">
+                                <div class="small-base">
 
-                    <el-col :xs="12" :sm="8" :md="8" :lg="4">
-                        <div class="overviewItem">
-                            <img class="small-panel-pic" src="~assets/dashboard/overview04.png" alt="" />
-                            <div class="small-base">
-                                <div class="small-title">日发电量</div>
-                                <div class="small-value">
-                                    <span class="content-number">{{realData.attributeMap.windfarmdayprodenergy}}</span>
-                                    <span>kWh</span>
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.windfarmavgwindspeed}}</span>
+                                        <span>m/s</span>
+                                    </div>
+                                    <div class="small-title">平均风速</div>
                                 </div>
-                            </div>
-                        </div>
-                    </el-col>
+                            </el-col>
+                            <el-col :xs="3" :sm="4" :md="4" :lg="4">
+                                <div class="small-base">
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.windfarmactivepower}}</span>
+                                        <span>kW</span>
+                                    </div>
+                                    <div class="small-title">实时有功</div>
+                                </div>
+                            </el-col>
+                            <el-col :xs="4" :sm="4" :md="4" :lg="4">
+                                <div class="small-base">
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.windfarmreactivepower}}</span>
+                                        <span>kvar</span>
+                                    </div>
+                                    <div class="small-title">实时无功</div>
+                                </div>
+                            </el-col>
+                            <el-col :xs="4" :sm="4" :md="4" :lg="4">
+                                <div class="small-base">
 
-                    <el-col :xs="12" :sm="8" :md="8" :lg="4">
-                        <div class="overviewItem">
-                            <img class="small-panel-pic" src="~assets/dashboard/overview05.png" alt="" />
-                            <div class="small-base">
-                                <div class="small-title">本月发电量</div>
-                                <div class="small-value">
-                                    <span class="content-number">{{realData.attributeMap.windfarmmonthprodenergy}}</span>
-                                    <span>kWh</span>
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.windfarmdayprodenergy}}</span>
+                                        <span>万kWh</span>
+                                    </div>
+                                    <div class="small-title">日发电量</div>
                                 </div>
-                            </div>
+                            </el-col>
+                            <el-col :xs="4" :sm="4" :md="4" :lg="4">
+                                <div class="small-base">
+
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.windfarmmonthprodenergy}}</span>
+                                        <span>万kWh</span>
+                                    </div>
+                                    <div class="small-title">本月发电量</div>
+                                </div>
+                            </el-col>
+                            <el-col :xs="4" :sm="4" :md="4" :lg="4">
+                                <div class="small-base" style="border: none;">
+
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.windfarmyearprodenergy}}</span>
+                                        <span>万kWh</span>
+                                    </div>
+                                    <div class="small-title">年发电量</div>
+                                </div>
+                            </el-col>
                         </div>
                     </el-col>
-                    <el-col :xs="12" :sm="8" :md="8" :lg="4">
-                        <div class="overviewItem" style="margin-right: 0px;">
-                            <img class="small-panel-pic" src="~assets/dashboard/overview06.png" alt="" />
-                            <div class="small-base">
-                                <div class="small-title">年发电量</div>
-                                <div class="small-value">
-                                    <span class="content-number">{{realData.attributeMap.windfarmyearprodenergy}}</span>
-                                    <span>kWh</span>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="8">
+                        <div class="overviewItem">
+                            <el-col :xs="3" :sm="3" :md="3" :lg="3">
+                                <img class="small-panel-pic" src="~assets/dashboard/overview08.png" alt="" />
+                            </el-col>
+
+                            <el-col :xs="4" :sm="4" :md="4" :lg="4">
+                                <div class="small-base">
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.turbinecountpowerprod}}</span>
+                                        <span>台</span>
+                                    </div>
+                                    <div class="small-title">并网台数</div>
                                 </div>
-                            </div>
+                            </el-col>
+                            <el-col :xs="6" :sm="6" :md="6" :lg="6">
+                                <div class="small-base">
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.turbinecountidle}}</span>
+                                        <span>台</span>
+                                    </div>
+                                    <div class="small-title">待机台数</div>
+                                </div>
+                            </el-col>
+                            <el-col :xs="6" :sm="6" :md="6" :lg="6">
+                                <div class="small-base">
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.turbinecountdisconnected}}</span>
+                                        <span>台</span>
+                                    </div>
+                                    <div class="small-title">断联台数</div>
+                                </div>
+                            </el-col>
+                            <el-col :xs="6" :sm="5" :md="5" :lg="5">
+                                <div class="small-base" style="border: none;">
+                                    <div class="small-value">
+                                        <span class="content-number">{{realData.attributeMap.turbinecountservice}}</span>
+                                        <span>台</span>
+                                    </div>
+                                    <div class="small-title">维护台数</div>
+                                </div>
+                            </el-col>
                         </div>
                     </el-col>
                 </el-row>
@@ -125,9 +160,7 @@
 </template>
 
 <script setup lang="ts">
-import { nextTick, onActivated, onMounted, reactive, ref, onBeforeMount, onUnmounted, VNodeRef } from 'vue'
-import * as echarts from 'echarts'
-import { useTemplateRefsList, useEventListener } from '@vueuse/core'
+import {  onMounted, reactive, ref, onUnmounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import WindContent from '/@/views/backend/home/windMatrix.vue'
 import { equipList } from '/@/api/backend/realData/request'
@@ -156,6 +189,11 @@ const attributeList = ref({
         'windfarmdayprodenergy',
         'windfarmmonthprodenergy',
         'windfarmyearprodenergy',
+        'turbinecountpowerprod',
+        'turbinecountidle',
+        'turbinecountdisconnected',
+        'turbinecountservice'
+
     ]
 })
 
@@ -174,9 +212,33 @@ const overviewList = () => {
             res.data.attributeMap.windfarmactivepower = formatAttributeValue(res.data.attributeMap.windfarmactivepower)
             res.data.attributeMap.windfarmreactivepower = formatAttributeValue(res.data.attributeMap.windfarmreactivepower)
             res.data.attributeMap.windfarmavgwindspeed = formatAttributeValue(res.data.attributeMap.windfarmavgwindspeed)
-            res.data.attributeMap.windfarmdayprodenergy = formatAttributeValue(res.data.attributeMap.windfarmdayprodenergy)
-            res.data.attributeMap.windfarmmonthprodenergy = formatAttributeValue(res.data.attributeMap.windfarmmonthprodenergy)
-            res.data.attributeMap.windfarmyearprodenergy = formatAttributeValue(res.data.attributeMap.windfarmyearprodenergy)
+            res.data.attributeMap.windfarmdayprodenergy = formatAttributeValue(res.data.attributeMap.windfarmdayprodenergy/10000)
+            res.data.attributeMap.windfarmmonthprodenergy = formatAttributeValue(res.data.attributeMap.windfarmmonthprodenergy/10000)
+            res.data.attributeMap.windfarmyearprodenergy = formatAttributeValue(res.data.attributeMap.windfarmyearprodenergy/10000)
+            res.data.attributeMap.turbinecountpowerprod =
+                res.data.attributeMap.turbinecountpowerprod !== undefined
+                ? res.data.attributeMap.turbinecountpowerprod % 1 === 0
+                    ? res.data.attributeMap.turbinecountpowerprod
+                    : res.data.attributeMap.turbinecountpowerprod.toFixed(0)
+                : '0'
+            res.data.attributeMap.turbinecountidle =
+                res.data.attributeMap.turbinecountidle !== undefined
+                ? res.data.attributeMap.turbinecountidle % 1 === 0
+                    ? res.data.attributeMap.turbinecountidle
+                    : res.data.attributeMap.turbinecountidle.toFixed(0)
+                : '0'
+            res.data.attributeMap.turbinecountdisconnected =
+                res.data.attributeMap.turbinecountdisconnected !== undefined
+                ? res.data.attributeMap.turbinecountdisconnected % 1 === 0
+                    ? res.data.attributeMap.turbinecountdisconnected
+                    : res.data.attributeMap.turbinecountdisconnected.toFixed(0)
+                : '0'
+            res.data.attributeMap.turbinecountservice =
+                res.data.attributeMap.turbinecountservice !== undefined
+                    ? res.data.attributeMap.turbinecountservice % 1 === 0
+                        ? res.data.attributeMap.turbinecountservice
+                        : res.data.attributeMap.turbinecountservice.toFixed(0)
+                    : '0'
             const data: any = {
                 windFarmId: res.data.windFarmId,
                 attributeMap: {
@@ -185,7 +247,11 @@ const overviewList = () => {
                     windfarmavgwindspeed: res.data.attributeMap.windfarmavgwindspeed,
                     windfarmdayprodenergy: res.data.attributeMap.windfarmdayprodenergy,
                     windfarmmonthprodenergy: res.data.attributeMap.windfarmmonthprodenergy,
-                    windfarmyearprodenergy: res.data.attributeMap.windfarmyearprodenergy
+                    windfarmyearprodenergy: res.data.attributeMap.windfarmyearprodenergy,
+                    turbinecountpowerprod: res.data.attributeMap.turbinecountpowerprod,
+                    turbinecountidle: res.data.attributeMap.turbinecountidle,
+                    turbinecountdisconnected: res.data.attributeMap.turbinecountdisconnected,
+                    turbinecountservice: res.data.attributeMap.turbinecountservice
                 },
             }
 
@@ -327,9 +393,6 @@ const StatusListData = () => {
     })
 }
 
-
-
-
 const timestampToTime = (timestamp: any) => {
     timestamp = timestamp ? timestamp : null
     let date = new Date(timestamp)
@@ -510,13 +573,13 @@ $labelHeight: 30px;
     background-color: #f2f3f5;
     .el-row {
         width: calc(100% - 0px);
-        .el-col {
+       /* .el-col {
             height: calc(100% - 10px);
-        }
+        }*/
     }
     .content-number {
         color: #333333;
-        font-size: 24px;
+        font-size: 22px;
     }
     .homelabel {
         font-family: PingFangSC-Semibold;
@@ -543,6 +606,10 @@ $labelHeight: 30px;
                 width: 80px;
                 height: 80px;
             }
+            .small-base{
+                text-align: center;
+                border-right: 1px #eeeeee solid;
+            }
         }
 
     }
@@ -612,7 +679,21 @@ $labelHeight: 30px;
         }
     }
 }
+@media screen and (max-width: 1280px) {
+    .default-main {
+        font-size: 12px !important;
+        .content-number {
+            font-size: 16px !important;
+        }
+        .overviewItem{
+            .small-panel-pic{
+                width: 40px!important;
+                height: 40px!important;
+            }
 
+        }
+    }
+}
 
 
 @media screen and (max-width: 1360px) {
@@ -632,7 +713,14 @@ $labelHeight: 30px;
     .default-main {
         /*font-size: 12px !important;*/
         .content-number {
-            font-size: 18px !important;
+            font-size: 16px !important;
+        }
+        .overviewItem{
+            .small-panel-pic{
+                width: 60px!important;
+                height: 60px!important;
+            }
+
         }
 
         .homelabel {
diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue
index 8a11ff67..2b359490 100644
--- a/ui/dasadmin/src/views/backend/home/windMatrix.vue
+++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue
@@ -2,7 +2,10 @@
     <div class="FanList-content">
         <el-row :gutter="10">
             <el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="3" v-for="(item, index) in props.parentData" style="margin-bottom: 5px">
-                <div class="grid-content ep-bg-purple" @click="handleClick(item)">
+                <div class="grid-content ep-bg-purple"
+                     @click="handleClick(item)"
+                     @contextmenu.prevent="windContextMenu($event,item)"
+                >
                     <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'">
@@ -71,13 +74,37 @@
                 </div>
             </el-col>
         </el-row>
+
+        <ContextMenu :pos="contextMenuPos" v-model:visible="OperateVisible">
+            <template #default>
+                <div class="modelOperate">
+                    <el-button
+                        class="control-btn"
+                        type="primary"
+                        @click="sendCommand('setTurbineFastStart')"
+                        v-if="realTimeData.iturbineoperationmode !== 16"
+                    >启动</el-button>
+                    <el-button @click="sendCommand('setTurbineStop')" v-else class="control-btn" type="primary">停机</el-button>
+                    <el-button @click="sendCommand('setTurbineResetStatusCode')" class="control-btn" type="primary">复位</el-button>
+                   <el-button
+                       @click="sendManualCommand(1)"
+                       v-if="realTimeData.locked !== 1"
+                       class="control-btn"
+                       type="primary">锁定</el-button>
+                    <el-button @click="sendManualCommand(0)" v-else class="control-btn" type="primary">解锁</el-button>
+                </div>
+            </template>
+        </ContextMenu>
     </div>
 </template>
 
 <script setup lang="ts">
-import { defineProps, defineEmits, onMounted, onUnmounted } from 'vue'
+import {defineProps, defineEmits, onMounted, onUnmounted, ref} from 'vue'
 import { useRouter } from 'vue-router'
 import { adminBaseRoutePath } from '/@/router/static/adminBase'
+import ContextMenu from '/@/views/backend/auth/model/contextMenu.vue'
+import { sendCommandReq, sendManualCommandReq } from '/@/api/backend/control/request'
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const router = useRouter()
 const props = defineProps({
@@ -126,6 +153,79 @@ const handleClick = (row) => {
         },
     })
 }
+
+const OperateVisible = ref(false)
+const contextMenuPos = ref({
+    x: 0,
+    y: 0,
+})
+const realTimeData = ref<any>({
+    iturbineoperationmode: 1111,
+    locked: 0,
+    deviceId: '',
+    name:''
+})
+const windContextMenu = (event: any,curnodeData) => {
+    contextMenuPos.value.x = event.pageX
+    contextMenuPos.value.y = event.pageY
+    realTimeData.value.iturbineoperationmode=curnodeData.attributeMap.iturbineoperationmode
+    realTimeData.value.locked=curnodeData.attributeMap.locked
+    realTimeData.value.deviceId=curnodeData.irn
+    realTimeData.value.name=curnodeData.name
+    OperateVisible.value = true
+}
+const sendCommand = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setTurbineResetStatusCode') => {
+    const sendTypeEnum = {
+        setTurbineFastStart: '风机快速启动指令',
+        setTurbineStop: '风机停机指令',
+        setTurbineResetStatusCode: '风机复位故障代码指令',
+    }
+    ElMessageBox.confirm('确认发送' + sendTypeEnum[type] + '吗？', '', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        const serviceName = sendTypeEnum[type]
+        const optDesc = serviceName + ',设定值为：1'
+        sendCommandReq({
+            deviceId: realTimeData.value.deviceId as string,
+            serviceCode: type,
+            serviceName,
+            optDesc,
+            opValue: 1,
+        }).then((res) => {
+            if (res.code == 200) {
+                ElMessage.success('指令发送成功')
+            } else {
+                ElMessage.error('指令发送失败')
+            }
+        })
+    })
+}
+
+const sendManualCommand = (type: 1 | 0) => {
+    const serviceName = type === 0 ? '风机解锁' : '风机锁定'
+    ElMessageBox.confirm('确认' + serviceName + '吗？', '', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        sendManualCommandReq({
+            deviceId: realTimeData.value.deviceId as string,
+            serviceCode: 'Locked',
+            serviceName,
+            optDesc: serviceName + ',设定值为：' + type,
+            opValue: type,
+        }).then((res) => {
+            if (res.code == 200) {
+                ElMessage.success('指令发送成功')
+            } else {
+                ElMessage.error('指令发送失败')
+            }
+        })
+    })
+}
+
 </script>
 
 <style scoped lang="scss">
@@ -247,10 +347,10 @@ const handleClick = (row) => {
                         text-align: center;
                         top: 5px;
                         left: 17px;
-                        z-index: 3;
+                       /* z-index: 3;*/
                     }
                     .leafs {
-                        z-index: 1;
+                       /* z-index: 1;*/
                         position: absolute;
                         /* animation: leafRotate 1s infinite linear;*/
                         transform-origin: center center;
@@ -313,6 +413,17 @@ const handleClick = (row) => {
             }
         }
     }
+    .modelOperate{
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+        width: 80px;
+       /* height: 80px;*/
+        .el-button {
+            margin: 5px;
+        }
+    }
 }
 
 @media screen and (max-width: 1680px) {

From bc675664f79ea54be3efa409d63ce5f323d47724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Thu, 5 Dec 2024 17:40:38 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E4=B8=BA=E9=A3=8E=E9=80=9F=E7=B3=BB?=
 =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../das/modules/cache/service/CalcCache.java  |  6 +-
 .../cache/service/impl/CalcCacheImpl.java     | 29 +++++----
 .../functions/FunctionWindSpeedFactor.java    | 59 +++++++++++++++++++
 .../impl/WindSpeedCorrectServiceImpl.java     |  9 +--
 .../mapper/SysPowerCurveFactorMapper.xml      |  4 +-
 5 files changed, 83 insertions(+), 24 deletions(-)
 create mode 100644 das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java

diff --git a/das/src/main/java/com/das/modules/cache/service/CalcCache.java b/das/src/main/java/com/das/modules/cache/service/CalcCache.java
index 883143f4..821a88ac 100644
--- a/das/src/main/java/com/das/modules/cache/service/CalcCache.java
+++ b/das/src/main/java/com/das/modules/cache/service/CalcCache.java
@@ -2,7 +2,9 @@ package com.das.modules.cache.service;
 
 import com.das.modules.cache.domain.WindSpeedCoefValue;
 
+import java.util.List;
+
 public interface CalcCache {
-    WindSpeedCoefValue getWindSpeedCoef(Long deviceId);
-    void putWindSpeedCoef(Long deviceId, WindSpeedCoefValue windSpeedCoefValue);
+    List<WindSpeedCoefValue> getWindSpeedCoef(Long deviceId);
+    void refreshWindSpeedCoef();
 }
diff --git a/das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java
index 748a0198..69789de9 100644
--- a/das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java
+++ b/das/src/main/java/com/das/modules/cache/service/impl/CalcCacheImpl.java
@@ -18,10 +18,20 @@ public class CalcCacheImpl implements CalcCache {
     @Autowired
     SysPowerCurveFactorMapper sysPowerCurveFactorMapper;
 
-    private ConcurrentHashMap<Long, WindSpeedCoefValue> windSpeedCoefMap = new ConcurrentHashMap<>();
+    private ConcurrentHashMap<Long, List<WindSpeedCoefValue>> windSpeedCoefMap = new ConcurrentHashMap<>();
 
     @PostConstruct
     private void init(){
+        refreshWindSpeedCoef();
+    }
+
+    @Override
+    public List<WindSpeedCoefValue> getWindSpeedCoef(Long deviceId) {
+        return windSpeedCoefMap.get(deviceId);
+    }
+
+    @Override
+    public void refreshWindSpeedCoef() {
         List<SysPowerCurveFactorVo> sysPowerCurveFactorVos = sysPowerCurveFactorMapper.querySysPowerCurveFactorList(new SysPowerCurveFactorDto());
         for (SysPowerCurveFactorVo sysPowerCurveFactorVo : sysPowerCurveFactorVos) {
             WindSpeedCoefValue windSpeedCoefValue = new WindSpeedCoefValue();
@@ -29,17 +39,12 @@ public class CalcCacheImpl implements CalcCache {
             windSpeedCoefValue.setMaxValue(sysPowerCurveFactorVo.getSpeedMax());
             windSpeedCoefValue.setCoef(sysPowerCurveFactorVo.getFactorK());
             windSpeedCoefValue.setBase(sysPowerCurveFactorVo.getFactorB());
-            windSpeedCoefMap.put(sysPowerCurveFactorVo.getTurbineId(), windSpeedCoefValue);
+            List<WindSpeedCoefValue> windSpeedCoefValues = windSpeedCoefMap.get(sysPowerCurveFactorVo.getTurbineId());
+            if (windSpeedCoefValues == null) {
+                windSpeedCoefValues = new java.util.ArrayList<>();
+            }
+            windSpeedCoefValues.add(windSpeedCoefValue);
+            windSpeedCoefMap.put(sysPowerCurveFactorVo.getTurbineId(), windSpeedCoefValues);
         }
     }
-
-    @Override
-    public WindSpeedCoefValue getWindSpeedCoef(Long deviceId) {
-        return windSpeedCoefMap.get(deviceId);
-    }
-
-    @Override
-    public void putWindSpeedCoef(Long deviceId, WindSpeedCoefValue windSpeedCoefValue) {
-        windSpeedCoefMap.put(deviceId, windSpeedCoefValue);
-    }
 }
diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java b/das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java
new file mode 100644
index 00000000..2765024b
--- /dev/null
+++ b/das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java
@@ -0,0 +1,59 @@
+package com.das.modules.calc.functions;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.das.modules.cache.domain.DeviceInfoCache;
+import com.das.modules.cache.domain.WindSpeedCoefValue;
+import com.das.modules.cache.service.CacheService;
+import com.das.modules.data.service.DataService;
+import com.googlecode.aviator.runtime.function.AbstractFunction;
+import com.googlecode.aviator.runtime.type.AviatorNil;
+import com.googlecode.aviator.runtime.type.AviatorObject;
+import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Aviator扩展函数  - 获取时间维度内平均
+ * 函数格式: avg(deviceId, attr, timedim)
+ * timedim: day - 天， month - 月， year - 年
+ * 返回值：数值，  nil - 获取错误
+ */
+@Slf4j
+public class FunctionWindSpeedFactor extends AbstractFunction {
+
+    private DataService dataService = null;
+    private CacheService cacheService = null;
+
+
+    public FunctionWindSpeedFactor(DataService dataService, CacheService cacheService) {
+        this.dataService = dataService;
+        this.cacheService = cacheService;
+    }
+
+    @Override
+    public String getName() {
+        return "windSpeedFactor";
+    }
+
+    @Override
+    public AviatorObject call(Map<String, Object> env, AviatorObject deviceCode) {
+        //设备Code
+        String code = (String)deviceCode.getValue(env);
+
+        DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheByCode(code);
+        if (deviceInfoCache == null) {
+            return AviatorNil.NIL;
+        }
+
+        List<WindSpeedCoefValue> windSpeedCoef = cacheService.getCalcCache().getWindSpeedCoef(deviceInfoCache.getDeviceId());
+        if (CollectionUtil.isEmpty(windSpeedCoef)){
+            return AviatorNil.NIL;
+        }
+        //未找到缓存，查询时序API获取数据
+        return AviatorRuntimeJavaType.valueOf(windSpeedCoef);
+    }
+
+}
diff --git a/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java
index 02cd903b..b1d40044 100644
--- a/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java
+++ b/das/src/main/java/com/das/modules/page/service/impl/WindSpeedCorrectServiceImpl.java
@@ -96,14 +96,7 @@ public class WindSpeedCorrectServiceImpl implements WindSpeedCorrectService {
         //批量插入数据库
         sysPowerCurveFactorMapper.insertBatch(listData);
         //更新缓存数据
-        listData.forEach(sysPowerCurveFactor -> {
-            WindSpeedCoefValue windSpeedCoefValue = new WindSpeedCoefValue();
-            windSpeedCoefValue.setMaxValue(sysPowerCurveFactor.getSpeedMax());
-            windSpeedCoefValue.setMinValue(sysPowerCurveFactor.getSpeedMin());
-            windSpeedCoefValue.setCoef(sysPowerCurveFactor.getFactorK());
-            windSpeedCoefValue.setBase(sysPowerCurveFactor.getFactorB());
-            cacheService.getCalcCache().putWindSpeedCoef(sysPowerCurveFactor.getTurbineId(),windSpeedCoefValue);
-        });
+        cacheService.getCalcCache().refreshWindSpeedCoef();
     }
 
     @Override
diff --git a/das/src/main/resources/mapper/SysPowerCurveFactorMapper.xml b/das/src/main/resources/mapper/SysPowerCurveFactorMapper.xml
index 4a3c1da9..f8b6af66 100644
--- a/das/src/main/resources/mapper/SysPowerCurveFactorMapper.xml
+++ b/das/src/main/resources/mapper/SysPowerCurveFactorMapper.xml
@@ -24,7 +24,7 @@
                 and t.turbine_id = #{info.turbineId}
             </if>
         </where>
-        order by  sq.name asc
+        order by  sq.name asc, t.speed_min asc
     </select>
 
     <select id="querySysPowerCurveFactorList" resultMap="resultMap">
@@ -46,7 +46,7 @@
                 </foreach>
             </if>
         </where>
-        order by  sq.name asc
+        order by  sq.name asc, t.speed_min asc
     </select>
 
 

From 6c29d130040ec20eeaa287e4df6a01684e602ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= <liuyuxia@jsspisoft.com>
Date: Thu, 5 Dec 2024 17:42:50 +0800
Subject: [PATCH 14/15] =?UTF-8?q?fix:=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/equipment/airBlower/index.vue     | 95 +++++++++----------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index 9cb2f788..458ab9a5 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -157,54 +157,54 @@
                 </el-table>
             </el-main>
         </el-container>
+        <el-dialog v-model="multiTaskVisible" :title="mutiTaskTitle" width="400" :close-on-click-modal="false">
+            <el-row v-for="item in mutiTaskList" :key="item.sendData.deviceId">
+                <el-col :span="18">
+                    <div class="mutiTaskName">
+                        {{ item.deviceName }}
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="mutiTaskStatus">
+                        <el-icon style="color: #f56c6c" size="30" v-if="item.loading === 3">
+                            <CircleClose />
+                        </el-icon>
+                        <el-icon style="color: #06b429" size="30" v-if="item.loading === 2">
+                            <CircleCheck />
+                        </el-icon>
+                        <el-icon style="color: #4fa5ff" size="30" class="mutiTaskLoading" v-if="item.loading === 1">
+                            <Loading />
+                        </el-icon>
+                        <div v-if="item.loading === 0">等待发送</div>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-dialog>
+        <el-dialog v-model="selectPointVisible" title="选择测点" width="1000">
+            <SelectPoint ref="selectPointDialogRef" :defaultAttr="defaultAttr" :visible="selectPointVisible"></SelectPoint>
+            <template #footer>
+                <div class="selectPointDialogFooter">
+                    <el-button type="primary" @click="saveSelectPoint">保存</el-button>
+                    <el-button @click="selectPointVisible = false">取消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+        <el-dialog v-model="realDataLineChartVisible" title="实时曲线" @close="closeLineChart" width="1000">
+            <RealDataChart
+                ref="realDataChartRef"
+                :visible="realDataLineChartVisible"
+                :id="clickRow!.irn"
+                @clearChart="() => (linePause = false)"
+            ></RealDataChart>
+            <template #header>
+                <div>
+                    <span style="font-size: 18px">实时曲线</span>
+                    <el-button class="saveBtn" @click="saveLineChart" type="primary" plain>保存</el-button>
+                    <el-button v-if="linePause" class="continueBtn" @click="continueLineChart" type="primary" plain>继续</el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
-    <el-dialog v-model="multiTaskVisible" :title="mutiTaskTitle" width="400" :close-on-click-modal="false">
-        <el-row v-for="item in mutiTaskList" :key="item.sendData.deviceId">
-            <el-col :span="18">
-                <div class="mutiTaskName">
-                    {{ item.deviceName }}
-                </div>
-            </el-col>
-            <el-col :span="6">
-                <div class="mutiTaskStatus">
-                    <el-icon style="color: #f56c6c" size="30" v-if="item.loading === 3">
-                        <CircleClose />
-                    </el-icon>
-                    <el-icon style="color: #06b429" size="30" v-if="item.loading === 2">
-                        <CircleCheck />
-                    </el-icon>
-                    <el-icon style="color: #4fa5ff" size="30" class="mutiTaskLoading" v-if="item.loading === 1">
-                        <Loading />
-                    </el-icon>
-                    <div v-if="item.loading === 0">等待发送</div>
-                </div>
-            </el-col>
-        </el-row>
-    </el-dialog>
-    <el-dialog v-model="selectPointVisible" title="选择测点" width="1000">
-        <SelectPoint ref="selectPointDialogRef" :defaultAttr="defaultAttr" :visible="selectPointVisible"></SelectPoint>
-        <template #footer>
-            <div class="selectPointDialogFooter">
-                <el-button type="primary" @click="saveSelectPoint">保存</el-button>
-                <el-button @click="selectPointVisible = false">取消</el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="realDataLineChartVisible" title="实时曲线" @close="closeLineChart" width="1000">
-        <RealDataChart
-            ref="realDataChartRef"
-            :visible="realDataLineChartVisible"
-            :id="clickRow!.irn"
-            @clearChart="() => (linePause = false)"
-        ></RealDataChart>
-        <template #header>
-            <div>
-                <span style="font-size: 18px">实时曲线</span>
-                <el-button class="saveBtn" @click="saveLineChart" type="primary" plain>保存</el-button>
-                <el-button v-if="linePause" class="continueBtn" @click="continueLineChart" type="primary" plain>继续</el-button>
-            </div>
-        </template>
-    </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -692,7 +692,6 @@ const openMeasure = () => {
 const saveSelectPoint = () => {
     const list = selectPointDialogRef.value?.getSelectList()
     if (list) {
-
         const addCoulmn = list.map((item: any) => {
             return {
                 label: item.unit ? item.attributeName + item.unit : item.attributeName,

From 6db2753f9153836bdfabdfaa1595b3581464d337 Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Thu, 5 Dec 2024 17:50:50 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index 9862e03c..d2d58e44 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -592,7 +592,7 @@ $labelHeight: 30px;
         display: block;
     }
     .overview {
-        width: calc(100% - 10px);
+        width: calc(100% - 5px);
         height: 100%;
         .overviewItem{
             height: 100px;