Merge branch 'main' of https://git.jsspisoft.com/ry-das

das/src/main/java/com/das/modules/fdr/domain/SysFaultRecordingDesc.java

@@ -46,4 +46,6 @@ public class SysFaultRecordingDesc {
     @TableField("updated_time")
     private Date updatedTime;
 
+    @TableField("unit")
+    private String unit;
 }

das/src/main/java/com/das/modules/fdr/domain/excel/SysFaultRecordingExcel.java

@@ -20,4 +20,9 @@ public class SysFaultRecordingExcel implements Serializable {
     @ExcelProperty(value = "中文描述",index = 1)
     private String description;
 
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位",index = 2)
+    private String unit;
 }

das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java

@@ -101,6 +101,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
         SheetInfoBean sheetDTO = new SheetInfoBean();
         map.put("variable", "英文名称");
         map.put("description", "中文描述");
+        map.put("unit","单位");
         sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
         sheetDTO.setFieldAndAlias(map);
         sheetDTO.setCollection(sysFaultRecordingDescList);

das/src/main/java/com/das/modules/plc/domain/Excel/SysRunLogExcel.java

@@ -20,4 +20,9 @@ public class SysRunLogExcel implements Serializable {
     @ExcelProperty(value = "中文描述",index = 1)
     private String description;
 
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位",index = 2)
+    private String unit;
 }

das/src/main/java/com/das/modules/plc/domain/SysRunLogDesc.java

@@ -1,5 +1,6 @@
 package com.das.modules.plc.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -46,4 +47,9 @@ public class SysRunLogDesc {
     @TableField("updated_time")
     private Date updatedTime;
 
+    /**
+     * 单位
+     */
+    @TableField("unit")
+    private String unit;
 }

das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java

@@ -122,6 +122,7 @@ public class PlcLogsServiceImpl implements PlcLogService {
         SheetInfoBean sheetDTO = new SheetInfoBean();
         map.put("variable", "英文名称");
         map.put("description", "中文描述");
+        map.put("unit","单位");
         sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
         sheetDTO.setFieldAndAlias(map);
         sheetDTO.setCollection(sysFaultRecordingDescList);

ui/dasadmin/src/views/backend/equipment/airBlower/index.vue

@@ -69,7 +69,7 @@
                     :data="tableData"
                     :header-row-style="tableHaderStyle"
                     @selectionChange="selectTable"
-                    max-height="100%"
+                    class="tableClass"
                 >
                     <el-table-column type="selection" width="55"></el-table-column>
                     <template v-for="item in tableColumn" :key="item.prop">
@@ -619,6 +619,10 @@ getBlongLineList()
         .mainPart {
             width: 100%;
             height: calc(100% - 60px);
+            .tableClass{
+                width: 100%;
+                height: 100%;
+            }
             .tableColumnClick {
                 text-decoration: underline;
                 color: #00a4ff;

ui/dasadmin/src/views/backend/logRecord/index.vue

@@ -478,7 +478,7 @@ const createSeriesData = () => {
         } else {
             const color = getRandomDarkColor()
             const data = {
-                name: item,
+                name: fileKeyEnums?.[item] ?? item,
                 type: 'line',
                 barWidth: 20,
                 itemStyle: {

ui/dasadmin/src/views/backend/malfunction/index.vue

@@ -483,7 +483,7 @@ const createSeriresData = () => {
         } else {
             const color = getRandomDarkColor()
             const data = {
-                name: item,
+                name: fileKeyEnums[item],
                 type: 'line',
                 barWidth: 20,
                 itemStyle: {