liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

Merge branch 'main' of http://47.107.152.87:3000/liubiao/dyf-vue-ui

Browse Source
This commit is contained in:
liub
2025-09-26 17:09:06 +08:00
parent 066e6da017 76c3a7c8bf
commit 81df83be26
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/equipmentAlarmRecord/index.vue
View File

@ -62,7 +62,7 @@
<el-card shadow="never"> <el-card shadow="never">
<div v-if="isListView" key="card"> <div v-if="isListView" key="card">
<el-row :gutter="20"> <el-row :gutter="20" v-if="alarmList.length > 0">
<el-col :span="6" v-for="(item, index) in alarmList" :key="index"> <el-col :span="6" v-for="(item, index) in alarmList" :key="index">
<el-card class="custom-alarm-card"> <el-card class="custom-alarm-card">
<div class="card-header"> <div class="card-header">
@ -113,6 +113,14 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" v-else>
<!-- 使用flex容器实现垂直居中布局 -->
<div
style="display: flex; flex-direction: column; align-items: center; justify-content: center; text-align: center; width: 100%;">
<img src="@/assets/images/noData.png" alt="暂无数据" style="max-width: 150px; margin-bottom: 16px;">
<div style="color: #999; font-size: 14px;">暂无数据</div>
</div>
</el-row>
</div> </div>
<div v-else key="list"> <div v-else key="list">
<el-table v-loading="loading" border :data="alarmList"> <el-table v-loading="loading" border :data="alarmList">
@ -123,7 +131,7 @@
<div>{{ scope.row.deviceImei }} {{ scope.row.deviceMac }}</div> <div>{{ scope.row.deviceImei }} {{ scope.row.deviceMac }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报警地点" align="center" prop="location" /> <el-table-column label="报警地点" align="center" prop="location" show-overflow-tooltip/>
<el-table-column label="报警事项" align="center" prop="deviceAction"> <el-table-column label="报警事项" align="center" prop="deviceAction">
<template #default="scope"> <template #default="scope">
<el-tag type="danger" v-if="scope.row.deviceAction == 0">强制报警</el-tag> <el-tag type="danger" v-if="scope.row.deviceAction == 0">强制报警</el-tag>

2
src/views/equipmentManagement/devices/index.vue
View File

@ -56,7 +56,7 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['equipment:devices:export']" type="warning" :disabled="multiple" plain <el-button v-hasPermi="['equipment:devices:export']" type="warning" plain
icon="Download" @click="handleExport">导出</el-button> icon="Download" @click="handleExport">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">