diff --git a/public/monitor/iframe.html b/public/monitor/iframe.html index 198b1b63..6771fb37 100644 --- a/public/monitor/iframe.html +++ b/public/monitor/iframe.html @@ -29,30 +29,35 @@ html, body { \ No newline at end of file diff --git a/src/views/kitchen/environment/videoMonitoring/history.vue b/src/views/kitchen/environment/videoMonitoring/history.vue index 3e5d6afc..66b49f19 100644 --- a/src/views/kitchen/environment/videoMonitoring/history.vue +++ b/src/views/kitchen/environment/videoMonitoring/history.vue @@ -1,103 +1,216 @@ - + @@ -110,7 +223,7 @@ methods:{ display: flex; align-items: center; color: #000; - margin-top: 20px; + margin-top: 10px; span{ margin-left: 40px; font-size: 20px; @@ -118,19 +231,14 @@ methods:{ } } .contant{ - width: 100%; + width: 1350px; height: auto; // height: 85%; display: flex; justify-content: center; align-content: center; - flex-wrap: wrap; - padding-top: 1%; + flex-wrap: wrap; } - - - - } diff --git a/src/views/kitchen/environment/videoMonitoring/index.vue b/src/views/kitchen/environment/videoMonitoring/index.vue index fe9c164c..f4adb3e0 100644 --- a/src/views/kitchen/environment/videoMonitoring/index.vue +++ b/src/views/kitchen/environment/videoMonitoring/index.vue @@ -1,55 +1,29 @@ - + - - diff --git a/src/views/kitchen/environment/videoMonitoring/temp.vue b/src/views/kitchen/environment/videoMonitoring/temp.vue new file mode 100644 index 00000000..f2fab0e6 --- /dev/null +++ b/src/views/kitchen/environment/videoMonitoring/temp.vue @@ -0,0 +1,376 @@ + + + +