Compare commits
2 Commits
edab894447
...
b59b564544
Author | SHA1 | Date | |
---|---|---|---|
b59b564544 | |||
0861c3e15f |
@ -4,12 +4,12 @@
|
|||||||
<!-- 搜索栏-->
|
<!-- 搜索栏-->
|
||||||
<el-form :inline="true" class="select-container">
|
<el-form :inline="true" class="select-container">
|
||||||
<el-form-item label="设备类型">
|
<el-form-item label="设备类型">
|
||||||
<el-select v-model="search.deviceType" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
|
<el-select v-model="search.deviceType" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
|
||||||
<el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.deviceTypeOptions" :key="key+'deviceTypeOptions'"></el-option>
|
<el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.deviceTypeOptions" :key="key+'deviceTypeOptions'"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="告警等级">
|
<el-form-item label="告警等级">
|
||||||
<el-select v-model="search.alarmLevel" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
|
<el-select v-model="search.alarmLevel" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
|
||||||
<el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.alarmLevelOptions" :key="key+'alarmLevelOptions'"></el-option>
|
<el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.alarmLevelOptions" :key="key+'alarmLevelOptions'"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -157,7 +157,7 @@ export default {
|
|||||||
},
|
},
|
||||||
// 搜索
|
// 搜索
|
||||||
onSearch(){
|
onSearch(){
|
||||||
const [alarmStartTime='',alarmEndTime='']=this.dateRange
|
const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
|
||||||
// 选中了时间范围
|
// 选中了时间范围
|
||||||
if(alarmStartTime && alarmStartTime){
|
if(alarmStartTime && alarmStartTime){
|
||||||
// 如果选择的时间范围是今天
|
// 如果选择的时间范围是今天
|
||||||
@ -182,7 +182,7 @@ export default {
|
|||||||
if(id !== this.activeBtn){
|
if(id !== this.activeBtn){
|
||||||
console.log('点击了不同的菜单,更新数据')
|
console.log('点击了不同的菜单,更新数据')
|
||||||
this.activeBtn=id;
|
this.activeBtn=id;
|
||||||
const [alarmStartTime,alarmEndTime]=this.dateRange
|
const [alarmStartTime,alarmEndTime]=(this.dateRange || [])
|
||||||
// 切换到今日告警,如果已经选择了时间范围清空
|
// 切换到今日告警,如果已经选择了时间范围清空
|
||||||
if(alarmStartTime && alarmEndTime){
|
if(alarmStartTime && alarmEndTime){
|
||||||
// 如果切换到了今日告警,时间范围不相等或者相等但是不是今天 清空时间选择范围
|
// 如果切换到了今日告警,时间范围不相等或者相等但是不是今天 清空时间选择范围
|
||||||
@ -201,7 +201,7 @@ export default {
|
|||||||
this.loading=true
|
this.loading=true
|
||||||
const {deviceType,alarmLevel} = this.search
|
const {deviceType,alarmLevel} = this.search
|
||||||
const {siteId,pageNum,pageSize,activeBtn} =this
|
const {siteId,pageNum,pageSize,activeBtn} =this
|
||||||
const [alarmStartTime='',alarmEndTime='']=this.dateRange
|
const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
|
||||||
let start='',end = '',now =new Date()
|
let start='',end = '',now =new Date()
|
||||||
if(activeBtn === 'today'){
|
if(activeBtn === 'today'){
|
||||||
start = end = now
|
start = end = now
|
||||||
@ -232,3 +232,4 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user