diff --git a/src/router/index.js b/src/router/index.js index 195cf4f..20f0f27 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -138,7 +138,7 @@ { path: '/listRule', name: 'ListRule', - component: () => import('@/views/alarmRule/listRule'), + component: () => import('@/views/alarmRule/alarmRule'), meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] } } ] diff --git a/src/router/index.js b/src/router/index.js index 195cf4f..20f0f27 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -138,7 +138,7 @@ { path: '/listRule', name: 'ListRule', - component: () => import('@/views/alarmRule/listRule'), + component: () => import('@/views/alarmRule/alarmRule'), meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] } } ] diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7fd3e22..39d9d58 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -174,11 +174,8 @@ } }, fetchDevice() { - debugger this.loading = true - debugger this.devices = [] - debugger // 获取液位可选列表 getDeviceSimpleList('2', '0').then(response => { debugger @@ -186,6 +183,7 @@ this.devices = [...this.device, ...response.data] // 获取开挖可选列表 getDeviceSimpleList('6', '0').then(response => { + debugger this.loading = false this.devices = [...this.device, ...response.data] })