sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
fengrong 2024-11-20 09:29:20 +08:00
commit 72e7885c34
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
View File

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

2
ui/dasadmin/src/views/backend/logRecord/index.vue
View File

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

2
ui/dasadmin/src/views/backend/malfunction/index.vue
View File

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