diff --git a/src/assets/icons/icon-ota.svg b/src/assets/icons/icon-ota.svg index bce1df0..3591070 100644 --- a/src/assets/icons/icon-ota.svg +++ b/src/assets/icons/icon-ota.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-ota.svg b/src/assets/icons/icon-ota.svg index bce1df0..3591070 100644 --- a/src/assets/icons/icon-ota.svg +++ b/src/assets/icons/icon-ota.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts index d4ec3f7..114683e 100644 --- a/src/router/modules/basic.ts +++ b/src/router/modules/basic.ts @@ -4,42 +4,6 @@ const routes: Route.recordRaw[] = [ { - path: '/basic/device', - component: Layout, - redirect: '/basic/device/list', - name: 'Device', - meta: { - title: '设备管理', - icon: 'ep:key', - auth: '/basic/device', - }, - children: [ - { - path: 'list', - name: 'DeviceList', - component: () => import('@/views/basic/device/list.vue'), - meta: { - title: '设备管理', - auth: '/basic/device', - sidebar: false, - breadcrumb: true, - activeMenu: '/basic/device', - }, - }, - { - path: 'detail/:id?', - name: 'DeviceInfoDetail', - component: () => import('@/views/basic/device/detail.vue'), - meta: { - title: '设备详情', - sidebar: false, - breadcrumb: true, - activeMenu: '/basic/device', - }, - }, - ], - }, - { path: '/basic/group', component: Layout, redirect: '/basic/group/list', @@ -76,6 +40,42 @@ ], }, { + path: '/basic/device', + component: Layout, + redirect: '/basic/device/list', + name: 'Device', + meta: { + title: '设备管理', + icon: 'ep:key', + auth: '/basic/device', + }, + children: [ + { + path: 'list', + name: 'DeviceList', + component: () => import('@/views/basic/device/list.vue'), + meta: { + title: '设备管理', + auth: '/basic/device', + sidebar: false, + breadcrumb: true, + activeMenu: '/basic/device', + }, + }, + { + path: 'detail/:type/:id?', + name: 'DeviceInfoDetail', + component: () => import('@/views/basic/device/detail.vue'), + meta: { + title: '设备详情', + sidebar: false, + breadcrumb: true, + activeMenu: '/basic/device', + }, + }, + ], + }, + { path: '/basic/product', component: Layout, redirect: '/basic/product/list', diff --git a/src/assets/icons/icon-ota.svg b/src/assets/icons/icon-ota.svg index bce1df0..3591070 100644 --- a/src/assets/icons/icon-ota.svg +++ b/src/assets/icons/icon-ota.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts index d4ec3f7..114683e 100644 --- a/src/router/modules/basic.ts +++ b/src/router/modules/basic.ts @@ -4,42 +4,6 @@ const routes: Route.recordRaw[] = [ { - path: '/basic/device', - component: Layout, - redirect: '/basic/device/list', - name: 'Device', - meta: { - title: '设备管理', - icon: 'ep:key', - auth: '/basic/device', - }, - children: [ - { - path: 'list', - name: 'DeviceList', - component: () => import('@/views/basic/device/list.vue'), - meta: { - title: '设备管理', - auth: '/basic/device', - sidebar: false, - breadcrumb: true, - activeMenu: '/basic/device', - }, - }, - { - path: 'detail/:id?', - name: 'DeviceInfoDetail', - component: () => import('@/views/basic/device/detail.vue'), - meta: { - title: '设备详情', - sidebar: false, - breadcrumb: true, - activeMenu: '/basic/device', - }, - }, - ], - }, - { path: '/basic/group', component: Layout, redirect: '/basic/group/list', @@ -76,6 +40,42 @@ ], }, { + path: '/basic/device', + component: Layout, + redirect: '/basic/device/list', + name: 'Device', + meta: { + title: '设备管理', + icon: 'ep:key', + auth: '/basic/device', + }, + children: [ + { + path: 'list', + name: 'DeviceList', + component: () => import('@/views/basic/device/list.vue'), + meta: { + title: '设备管理', + auth: '/basic/device', + sidebar: false, + breadcrumb: true, + activeMenu: '/basic/device', + }, + }, + { + path: 'detail/:type/:id?', + name: 'DeviceInfoDetail', + component: () => import('@/views/basic/device/detail.vue'), + meta: { + title: '设备详情', + sidebar: false, + breadcrumb: true, + activeMenu: '/basic/device', + }, + }, + ], + }, + { path: '/basic/product', component: Layout, redirect: '/basic/product/list', diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts index 6278c5b..6ac6c07 100644 --- a/src/router/modules/data.ts +++ b/src/router/modules/data.ts @@ -7,7 +7,7 @@ path: '/data/query', component: Layout, redirect: '/data/query/list', - name: 'Group', + name: 'Query', meta: { title: '数据查询', icon: 'ep:key', diff --git a/src/assets/icons/icon-ota.svg b/src/assets/icons/icon-ota.svg index bce1df0..3591070 100644 --- a/src/assets/icons/icon-ota.svg +++ b/src/assets/icons/icon-ota.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts index d4ec3f7..114683e 100644 --- a/src/router/modules/basic.ts +++ b/src/router/modules/basic.ts @@ -4,42 +4,6 @@ const routes: Route.recordRaw[] = [ { - path: '/basic/device', - component: Layout, - redirect: '/basic/device/list', - name: 'Device', - meta: { - title: '设备管理', - icon: 'ep:key', - auth: '/basic/device', - }, - children: [ - { - path: 'list', - name: 'DeviceList', - component: () => import('@/views/basic/device/list.vue'), - meta: { - title: '设备管理', - auth: '/basic/device', - sidebar: false, - breadcrumb: true, - activeMenu: '/basic/device', - }, - }, - { - path: 'detail/:id?', - name: 'DeviceInfoDetail', - component: () => import('@/views/basic/device/detail.vue'), - meta: { - title: '设备详情', - sidebar: false, - breadcrumb: true, - activeMenu: '/basic/device', - }, - }, - ], - }, - { path: '/basic/group', component: Layout, redirect: '/basic/group/list', @@ -76,6 +40,42 @@ ], }, { + path: '/basic/device', + component: Layout, + redirect: '/basic/device/list', + name: 'Device', + meta: { + title: '设备管理', + icon: 'ep:key', + auth: '/basic/device', + }, + children: [ + { + path: 'list', + name: 'DeviceList', + component: () => import('@/views/basic/device/list.vue'), + meta: { + title: '设备管理', + auth: '/basic/device', + sidebar: false, + breadcrumb: true, + activeMenu: '/basic/device', + }, + }, + { + path: 'detail/:type/:id?', + name: 'DeviceInfoDetail', + component: () => import('@/views/basic/device/detail.vue'), + meta: { + title: '设备详情', + sidebar: false, + breadcrumb: true, + activeMenu: '/basic/device', + }, + }, + ], + }, + { path: '/basic/product', component: Layout, redirect: '/basic/product/list', diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts index 6278c5b..6ac6c07 100644 --- a/src/router/modules/data.ts +++ b/src/router/modules/data.ts @@ -7,7 +7,7 @@ path: '/data/query', component: Layout, redirect: '/data/query/list', - name: 'Group', + name: 'Query', meta: { title: '数据查询', icon: 'ep:key', diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue index 9b130e0..97ba1ed 100644 --- a/src/views/basic/device/addDeviceDialog.vue +++ b/src/views/basic/device/addDeviceDialog.vue @@ -60,7 +60,8 @@ createTime: '', } - // infoFormRef.value.clearValidate() + infoFormRef.value.clearValidate() + showDialog.value = false } // 添加 @@ -72,9 +73,8 @@ // 提示保存成功 ElMessage.success('保存成功') - resetForm() emit('recordSaved') - showDialog.value = false + resetForm() } else { // 提示失败信息 @@ -89,9 +89,8 @@ // 提示保存成功 ElMessage.success('保存成功') - resetForm() emit('recordSaved') - showDialog.value = false + resetForm() } else { // 提示失败信息 @@ -158,6 +157,10 @@ break } + nextTick(() => { + infoFormRef.value.clearValidate() + }) + showDialog.value = true } @@ -167,7 +170,7 @@