0017
/
smart-power-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交： 优化 告警和预警列表 默认 告警时间 降序 排列参数

This commit is contained in:
23688nl 2022-09-15 15:54:05 +08:00
parent 3d1e5a545b
commit e7149ea08b
6 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/iot/alarm/record/index.vue
View File

@ -235,6 +235,8 @@ export default {
beginTime: null,
endTime: null,
alarmDivide: "ALARM",
isAsc: 'desc',
orderByColumn: 'alarmTime'
},
// 表单参数
form: {},

2
src/views/iot/alarm/waringRecord/index.vue
View File

@ -211,6 +211,8 @@ export default {
beginTime: null,
endTime: null,
alarmDivide: "WARNING",
isAsc: 'desc',
orderByColumn: 'alarmTime'
},
// 表单参数
form: {},

4
src/views/iot/video/site/index.vue
View File

@ -85,7 +85,7 @@
<span :title="scope.row.siteAddress" class="lay-table-textarea">{{ scope.row.siteAddress || '--'}}</span>
</template>
</el-table-column>
<el-table-column label="站点状态" align="center" width="100" prop="siteStatus">
<!-- <el-table-column label="站点状态" align="center" width="100" prop="siteStatus">
<template slot-scope="scope">
<div class="list-row">
<span class="notice-item" :class="noticeState(scope.row.siteStatus)"></span>
@ -95,7 +95,7 @@
></span>
</div>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="接入协议" align="left" width="100" prop="videoProtocol" />
<el-table-column label="站点通道" align="left" width="200" prop="devId" />
<el-table-column label="设备编码" align="left" width="150" prop="devCode" />

2
src/views/tenant/alarm/record.vue
View File

@ -238,6 +238,8 @@ export default {
beginTime: null,
endTime: null,
alarmDivide: "ALARM",
isAsc: 'desc',
orderByColumn: 'alarmTime'
},
// 表单参数
form: {},

2
src/views/tenant/alarm/warning.vue
View File

@ -236,6 +236,8 @@ export default {
beginTime: null,
endTime: null,
alarmDivide: "WARNING",
isAsc: 'desc',
orderByColumn: 'alarmTime'
},
// 表单参数
form: {},

5
yarn.lock
View File

@ -903,6 +903,11 @@
cssnano-preset-default "^4.0.0"
postcss "^7.0.0"
"@liveqing/liveplayer@^2.7.0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@liveqing/liveplayer/-/liveplayer-2.7.0.tgz#06b7c4093cc299b6f9cff060e9ef4835ff6f8f70"
integrity sha512-SWveQRqhhfJzkcpmHZxL6eLn+xLQuub888/JiBtUDHgt1eVwYYsorDiGcAKciNcyD70PuMfQ3+QrLoLbWE2vWA==
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"