diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue index 3e7ceaa..2177b1f 100644 --- a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue @@ -217,56 +217,20 @@ const columns = [{ const columns_info = [{ title: 'NUCLIDE', align: 'left', - dataIndex: 'nuclide' + dataIndex: 'nuclide', + width:200 },{ title: 'THRESHOLD ', align: 'left', - dataIndex: 'threshold' + dataIndex: 'threshold', + width:200 },{ - title: 'ARMDARR', + title: 'VALUE ', align: 'left', - dataIndex: 'ARMDARR', - customRender: (val) => { - if(!val){ - return "--" - } else{ - return val - } - } - },{ - title: 'ARMDRRR', - align: 'left', - dataIndex: 'ARMDRRR', - customRender: (val) => { - if(!val){ - return "--" - } else{ - return val - } - } - },{ - title: 'IDCARR', - align: 'left', - dataIndex: 'IDCARR', - customRender: (val) => { - if(!val){ - return "--" - } else{ - return val - } - } - },{ - title: 'IDCRRR', - align: 'left', - dataIndex: 'IDCRRR', - customRender: (val) => { - if(!val){ - return "--" - } else{ - return val - } - } - } + dataIndex: 'value', + width:200 + }, + ] export default { components: { diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue index 6aad4f0..2f3647a 100644 --- a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue @@ -19,6 +19,7 @@ :maxTagCount="1" :filter-option="filterOption" show-arrow + allowClear :options="stationOptions" @change="onStationChange" > @@ -33,7 +34,7 @@ dictCode="alarm_analyse_rule_source" /> - + Nuclide