Merge remote-tracking branch 'origin/main'

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/theoreticalpowerCurve/index.vue

@@ -65,8 +65,9 @@
                         </div>
                         <div class="tabsPart">
                             <el-table :data="faultRecordingpageData" class="tablePart">
-                                <el-table-column prop="variable" label="列路" align="center"> </el-table-column>
+                                <el-table-column prop="variable" label="变量" align="center"> </el-table-column>
                                 <el-table-column prop="description" label="中文" align="center"> </el-table-column>
+                                <el-table-column prop="unit" label="单位" align="center"> </el-table-column>
                             </el-table>
                         </div>
                         <div class="mainFooter">
@@ -76,7 +77,7 @@
                                 :total="paginationOptions1.total"
                                 :page-sizes="paginationOptions1.pageSizes"
                                 background
-                                :pager-count="7"
+                                :pager-count="5"
                                 layout="prev, pager, next"
                                 @size-change="handleSizeChange1"
                                 @current-change="handleCurrentChange1"
@@ -99,8 +100,9 @@
                         </div>
                         <div class="tabsPart">
                             <el-table :data="runLogpageData" class="tablePart">
-                                <el-table-column prop="variable" label="列路" align="center"> </el-table-column>
+                                <el-table-column prop="variable" label="变量" align="center"> </el-table-column>
                                 <el-table-column prop="description" label="中文" align="center"> </el-table-column>
+                                <el-table-column prop="unit" label="单位" align="center"> </el-table-column>
                             </el-table>
                         </div>
                         <div class="mainFooter">
@@ -110,7 +112,7 @@
                                 :total="paginationOptions2.total"
                                 :page-sizes="paginationOptions2.pageSizes"
                                 background
-                                :pager-count="7"
+                                :pager-count="5"
                                 layout="prev, pager, next"
                                 @size-change="handleSizeChange2"
                                 @current-change="handleCurrentChange2"
@@ -608,14 +610,14 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 $headerHeight: 60px;
-// $defaultBackgroundColor: #fff;
+$defaultBackgroundColor: #fff;
 $defaultAsideWidth: 260px;
 $paginationHeight: 32px;
 .theoreticalpowerCurve {
     position: relative;
     width: 100%;
     height: 100%;
-    background: transparent;
+    // background: transparent;
     .mainContainer {
         display: flex;
         flex-direction: column;
@@ -720,15 +722,15 @@ $paginationHeight: 32px;
             .bottom-left {
                 margin-right: 20px;
             }
-            .box-card3 {
-                width: 50%;
             .tabsPart {
                 height: 240px;
                 padding-bottom: 5px;
-                    :deep(el-table .cel) {
+                :deep(.el-table .cell) {
                     white-space: nowrap;
                 }
             }
+            .box-card3 {
+                width: 50%;
             }
         }
     }