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 
# Conflicts:
#	src/views/fys-equipment/fenceAccessRecord/index.vue
This commit is contained in:
liub
2025-09-25 13:08:48 +08:00
parent fb13f40ac1 cf05f857bd
commit 066e6da017
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,7 @@ onUnmounted(() => {
} }
.custom-alarm-card { .custom-alarm-card {
height: 270px; min-height: 270px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
box-shadow: 0px 0px 6px 0px rgba(0, 27, 74, 0.1); box-shadow: 0px 0px 6px 0px rgba(0, 27, 74, 0.1);
@ -379,7 +379,7 @@ onUnmounted(() => {
.deviceName { .deviceName {
color: rgba(56, 64, 79, 1); color: rgba(56, 64, 79, 1);
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-size: 16px; font-size: 14px;
font-weight: 700; font-weight: 700;
} }

8
src/views/fys-equipment/fenceAccessRecord/index.vue
View File

@ -5,7 +5,7 @@
<div class="button-row"> <div class="button-row">
<!-- <el-button type="primary" @click.stop="ShowEdit(null)" <!-- <el-button type="primary" @click.stop="ShowEdit(null)"
><el-icon><Plus /></el-icon>新增</el-button --> ><el-icon><Plus /></el-icon>新增</el-button -->
<el-button type="primary" @click.stop="Export()" plain <el-button type="primary" @click.stop="Export()" plain
><el-icon><Download /></el-icon>导出</el-button ><el-icon><Download /></el-icon>导出</el-button
> >
@ -83,13 +83,13 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="经纬度" align="center" prop="id"> <el-table-column label="经纬度" align="center" prop="id">
<template #default="scope"> <template #default="scope">
<span style="margin-right: 15px">{{ scope.row.longitude }}</span <span style="margin-right: 15px">{{ scope.row.longitude }}</span
><span>{{ scope.row.latitude }}</span> ><span>{{ scope.row.latitude }}</span>
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column label="事件地址" align="left" prop="eventAddress"> </el-table-column> <el-table-column label="精度" align="userName" prop="accuracy"> </el-table-column>
<el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width"> <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">