From b814de9ab5cd3ce8ac832c7ac711d56311232a35 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Tue, 7 Feb 2023 10:05:15 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- src/views/login.vue | 626 +++++++++--------- .../listenManage/module/bindCamera.vue | 2 + .../listenManage/videoListen/index.vue | 5 +- .../tagManage/bindTagList/index.vue | 413 ++++++------ 5 files changed, 529 insertions(+), 519 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 47be649..a84acb6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,7 @@ import { filterAsyncRouter } from '@/store/modules/permission' NProgress.configure({ showSpinner: false })// NProgress Configuration -const whiteList = ['/login']// no redirect whitelist +const whiteList = ['/login', '/environmentalScreen']// no redirect whitelist router.beforeEach((to, from, next) => { if (to.meta.title) { diff --git a/src/views/login.vue b/src/views/login.vue index c4e5235..b958a33 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,313 +1,313 @@ - - - - - + + + + + diff --git a/src/views/storeManage/listenManage/module/bindCamera.vue b/src/views/storeManage/listenManage/module/bindCamera.vue index 21e08ed..b313869 100644 --- a/src/views/storeManage/listenManage/module/bindCamera.vue +++ b/src/views/storeManage/listenManage/module/bindCamera.vue @@ -96,6 +96,8 @@ export default { this.devOptions = devices.map(data => { return { value: data.id, label: data.storeroomId.name + '-' + data.deviceName, self: data } }) if (this.devOptions?.length > 0) { this.devType = this.devOptions[0].value + } else { + this.devType = '' } }) }, diff --git a/src/views/storeManage/listenManage/videoListen/index.vue b/src/views/storeManage/listenManage/videoListen/index.vue index 1d2ab52..6f7ce06 100644 --- a/src/views/storeManage/listenManage/videoListen/index.vue +++ b/src/views/storeManage/listenManage/videoListen/index.vue @@ -24,7 +24,7 @@ --> - + @@ -59,7 +59,8 @@ export default { cruds() { return CRUD({ url: 'api/videos/list', - optShow: {} + optShow: {}, + sort: ['createTime,desc'] }) }, data() { diff --git a/src/views/storeManage/tagManage/bindTagList/index.vue b/src/views/storeManage/tagManage/bindTagList/index.vue index 501adc0..1a60bc8 100644 --- a/src/views/storeManage/tagManage/bindTagList/index.vue +++ b/src/views/storeManage/tagManage/bindTagList/index.vue @@ -1,203 +1,210 @@ - - - - - + + + + +