Merge remote-tracking branch 'origin/main'

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: {