diff --git a/src/router/index.js b/src/router/index.js index 621b39c..4b8c2b6 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 621b39c..4b8c2b6 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/components/editRule.vue b/src/views/alarmRule/components/editRule.vue index 3149b14..8a91c41 100644 --- a/src/views/alarmRule/components/editRule.vue +++ b/src/views/alarmRule/components/editRule.vue @@ -196,10 +196,10 @@ } else { // 如果是新增 this.resetForm() this.fetchDevice() - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) } + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) }, // 获取可设置告警规则设备列表 fetchDevice() { diff --git a/src/router/index.js b/src/router/index.js index 621b39c..4b8c2b6 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/components/editRule.vue b/src/views/alarmRule/components/editRule.vue index 3149b14..8a91c41 100644 --- a/src/views/alarmRule/components/editRule.vue +++ b/src/views/alarmRule/components/editRule.vue @@ -196,10 +196,10 @@ } else { // 如果是新增 this.resetForm() this.fetchDevice() - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) } + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) }, // 获取可设置告警规则设备列表 fetchDevice() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index cbc4822..d39eb05 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -174,14 +174,10 @@ } }, fetchDevice() { - debugger this.loading = true - debugger this.devices = [] - debugger // 获取液位可选列表 getDeviceSimpleList('2', '0').then(response => { - debugger this.loading = false this.devices = [...this.device, ...response.data] // 获取开挖可选列表