|
@@ -131,7 +131,7 @@
|
|
|
boxShadow: `0 0 10px ${getColValueColor(col, item)}`,
|
|
boxShadow: `0 0 10px ${getColValueColor(col, item)}`,
|
|
|
}"
|
|
}"
|
|
|
></span>
|
|
></span>
|
|
|
- {{ getColDisplayText(col, item) }}
|
|
|
|
|
|
|
+ <span class="text-content"> {{ getColDisplayText(col, item) }} </span>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -267,7 +267,7 @@
|
|
|
{ label: '瓦斯等级', key: 'gasLevelName', type: 'alarm', showPoint: true },
|
|
{ label: '瓦斯等级', key: 'gasLevelName', type: 'alarm', showPoint: true },
|
|
|
{ label: '煤层自燃倾向性', key: 'coalSeamLevel', type: 'text' },
|
|
{ label: '煤层自燃倾向性', key: 'coalSeamLevel', type: 'text' },
|
|
|
{ label: '联网', key: 'status', colorKey: 'status', type: 'status', showPoint: true },
|
|
{ label: '联网', key: 'status', colorKey: 'status', type: 'status', showPoint: true },
|
|
|
- { label: '永久密闭数量', key: 'goafNum', type: 'text' },
|
|
|
|
|
|
|
+ { label: '永久密闭数量', key: 'goafDataCount', type: 'custom' },
|
|
|
{ label: '报警数量', key: 'alarmCount', type: 'custom' },
|
|
{ label: '报警数量', key: 'alarmCount', type: 'custom' },
|
|
|
{ label: '报警原因', key: 'alarmReasons', type: 'custom' },
|
|
{ label: '报警原因', key: 'alarmReasons', type: 'custom' },
|
|
|
{ label: '开始时间', key: 'earliestTime', type: 'text' },
|
|
{ label: '开始时间', key: 'earliestTime', type: 'text' },
|
|
@@ -354,7 +354,7 @@
|
|
|
*/
|
|
*/
|
|
|
const getRiskText = (level?: string | number) => {
|
|
const getRiskText = (level?: string | number) => {
|
|
|
if (!level && level !== 0) return '-';
|
|
if (!level && level !== 0) return '-';
|
|
|
- return RISK_LEVEL_MAP[String(level)]?.text || '未知';
|
|
|
|
|
|
|
+ return RISK_LEVEL_MAP[String(level)]?.text || '-';
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -436,6 +436,12 @@
|
|
|
if (col.type === 'status') {
|
|
if (col.type === 'status') {
|
|
|
return getlinkStatusInfo(rawValue).text;
|
|
return getlinkStatusInfo(rawValue).text;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // 处理永久密闭数量:取 goafDataList 的长度
|
|
|
|
|
+ if (col.key === 'goafDataCount') {
|
|
|
|
|
+ return item.goafDataList && Array.isArray(item.goafDataList) ? item.goafDataList.length : 0;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (col.key === 'alarmCount') {
|
|
if (col.key === 'alarmCount') {
|
|
|
// 取 alarmRecordList 的长度
|
|
// 取 alarmRecordList 的长度
|
|
|
return item.alarmRecordList ? item.alarmRecordList.length : 0;
|
|
return item.alarmRecordList ? item.alarmRecordList.length : 0;
|
|
@@ -1137,12 +1143,25 @@
|
|
|
.col-value {
|
|
.col-value {
|
|
|
color: #000;
|
|
color: #000;
|
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
|
|
|
+ display: flex;
|
|
|
|
|
+ align-items: center;
|
|
|
|
|
+ width: 100%;
|
|
|
|
|
+ overflow: visible;
|
|
|
|
|
|
|
|
.status-dot {
|
|
.status-dot {
|
|
|
width: 8px;
|
|
width: 8px;
|
|
|
height: 8px;
|
|
height: 8px;
|
|
|
|
|
+ margin-right: 5px;
|
|
|
border-radius: 50%;
|
|
border-radius: 50%;
|
|
|
display: inline-block;
|
|
display: inline-block;
|
|
|
|
|
+ flex-shrink: 0;
|
|
|
|
|
+ }
|
|
|
|
|
+ .text-content {
|
|
|
|
|
+ flex: 1;
|
|
|
|
|
+ white-space: nowrap;
|
|
|
|
|
+ overflow: hidden;
|
|
|
|
|
+ text-overflow: ellipsis;
|
|
|
|
|
+ min-width: 0;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1150,15 +1169,15 @@
|
|
|
grid-column: span 1;
|
|
grid-column: span 1;
|
|
|
}
|
|
}
|
|
|
.col-second-row:nth-child(6) {
|
|
.col-second-row:nth-child(6) {
|
|
|
- grid-column: 1 / span 3; // 占据第 1 到第 3 列
|
|
|
|
|
|
|
+ grid-column: 1 / span 3;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.col-second-row:nth-child(7) {
|
|
.col-second-row:nth-child(7) {
|
|
|
- grid-column: span 1; // 占据第 4 列
|
|
|
|
|
|
|
+ grid-column: span 1;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.col-second-row:nth-child(8) {
|
|
.col-second-row:nth-child(8) {
|
|
|
- grid-column: span 1; // 占据第 5 列
|
|
|
|
|
|
|
+ grid-column: span 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|