bug修复

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) {

src/views/login.vue

@@ -96,7 +96,7 @@ export default {
       cookiePass: '',
       loginForm: {
         username: 'admin',
-        password: '123456',
+        password: '',
         rememberMe: false,
         code: '',
         uuid: ''

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 = ''
         }
       })
     },

src/views/storeManage/listenManage/videoListen/index.vue

@@ -24,7 +24,7 @@
       </el-table-column> -->
       <el-table-column prop="deviceCamerBindId.storeroomName" label="所属区域" min-width="150" align="center" />
       <el-table-column prop="deviceCamerBindId.deviceName" label="设备" align="center" min-width="150" />
-      <el-table-column prop="cameraName" label="摄像头" align="center" min-width="150" />
+      <el-table-column prop="deviceCamerBindId.cameraName" label="摄像头" align="center" min-width="150" />
       <el-table-column prop="event" label="事件" align="center" min-width="180" />
       <el-table-column prop="description" label="内容描述" align="center" min-width="180" />
       <el-table-column prop="create_time" label="事件发生时间" align="center" min-width="180">
@@ -59,7 +59,8 @@ export default {
   cruds() {
     return CRUD({
       url: 'api/videos/list',
-      optShow: {}
+      optShow: {},
+      sort: ['createTime,desc']
     })
   },
   data() {

src/views/storeManage/tagManage/bindTagList/index.vue

@@ -14,8 +14,9 @@
       </div>
       <div class="archives-handler-btn">
         <!-- iconfont icon-weibiaoti-2 -->
-        <el-button class="lending-btn" type="primary" :loading="unbindBtnLoading" :disabled="selections.length === 0" @click="unbind()">
-          <svg-icon icon-class="remove_bind" class-name="svg-style" style="margin-right:8px" />解除绑定
+        <el-button class="lending-btn iconfont icon-jiechubangding-fanbai" type="primary" size="mini" :loading="unbindBtnLoading" :disabled="selections.length === 0" @click="unbind()">
+          <!-- <svg-icon icon-class="remove_bind" class-name="svg-style" style="margin-right:8px" /> -->
+          解除绑定
         </el-button>
       </div>
     </div>
@@ -194,8 +195,14 @@ export default {
   }
 }
 .archives-handler-btn .el-button {
-  height: 30px;
+  // height: 30px;
   width: 106px;
+  ::v-deep span{
+    margin-left: 0;
+  }
+  &::before {
+    padding-left: 5px;
+  }
 }
 ::v-deep .input-prepend .el-input__inner {
     padding-left: 100px;