Browse Source

fix: time get fail

hulinfei 3 years ago
parent
commit
63f600c1a2

+ 2 - 1
src/views/device/camera/components/Detail.vue

@@ -381,7 +381,7 @@ export default {
         onehour = 0
       }
       var startTime = time1 - onehour
-      startTime = new Date(startTime).toLocaleString()
+      startTime = new Date(startTime).toLocaleString('zh', { hour12: false })
       startTime = startTime.split('/').join('-')
       var arr = startTime.split(' ')[0].split('-')
       for (let i = 0; i < arr.length; i++) {
@@ -511,6 +511,7 @@ export default {
   width: 100%;
   height: 100%;
   position: relative;
+  overflow: hidden;
   .closeDetail {
     position: absolute;
     right: 20px;

+ 1 - 1
src/views/device/camera/index.vue

@@ -514,7 +514,7 @@ video::-webkit-media-controls-enclosure {
   height: 100%;
 }
 .rowheight {
-  height: calc(100% - 40px);
+  // height: calc(100% - 40px);
   overflow: auto;
 }
 .c-tabs {