1
0
forked from dyf/dyf-vue-ui

Merge remote-tracking branch 'origin/main'

This commit is contained in:
2025-09-18 09:19:56 +08:00

View File

@ -101,13 +101,13 @@
<span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
</template>
</div>
<div class="label">报警地点</div>
<div class="label">报警地点</div>
<div class="alearmADD">
{{ item.location }}
</div>
<div v-if="item.treatmentState === 0" class="dl_bot d_fl">
<div>时长:{{ item.durationTime }}</div>
<div>解除: {{ item.finishTime.split(' ')[1] || '' }}</div>
<div v-if="item.durationTime">时长:{{ item.durationTime }}</div>
<div v-if="item.finishTime">解除: {{ item.finishTime.split(' ')[1] || '' }}</div>
</div>
</div>
</el-card>
@ -219,8 +219,11 @@ const getList = async () => {
queryTime2: endTime
};
const res = await listAlarm(queryParams.value);
if (res.rows) {
alarmList.value = res.rows;
total.value = res.total;
}
loading.value = false;
}
// 设备类型
@ -271,6 +274,7 @@ onMounted(() => {
:deep .el-collapse {
border-top: none
}
:deep .el-collapse-item__header {
display: none;
}