代码优化

2023-08-21 13:51:11 +08:00 · 2023-08-21 13:51:11 +08:00 · a53b466bf1
commit a53b466bf1
parent eacddb549d
1 changed files with 0 additions and 6 deletions
--- a/src/views/abnormalAlarm/emailMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
@ -205,18 +205,12 @@ const columns = [
      customRender: 'status'
    }
  },{
-<<<<<<< Updated upstream
    title: 'ENABLE',
    align: 'left',
    dataIndex: 'enabled',
    scopedSlots: {
      customRender: 'enabled'
    }
-=======
-    title: 'ENABLE OR NOT',
-    align: 'center',
-    dataIndex: 'enabled'
->>>>>>> Stashed changes
  },{
    title: 'E-MAIL',
    align: 'center',