update

css/hardware.css

@@ -275,30 +275,42 @@
   max-width: 120px;
 }
 
+.m-con{
+  width: 800px;
+  padding: 0;
+}
+
+
+.m-con .monitorbody{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  background: #262729;
+  align-items: center;
+}
 
 .m-con .iconquxiao{
   position: absolute;
-  top: 24px;
-  right: 15px;
+  top: 5px;
+  right: 5px;
   color: #F5F5F5;
   font-size: 10px;
   cursor: pointer;
-  z-index: 999;
+  z-index: 9999;
 }
 
-.m-con{
-  min-width: 800px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+.m-con .monitorbody .mvideo{
+  width: 50%;
+  height: 100%;
 }
-#monitor{
-  width: 60%;
+
+
+.m-con .monitorbody #monitor{
+  width: 100%;
   height: 100%;
-  background: #262729;
 }
 
-.calendar{
-  width: 40%;
+.m-con .monitorbody .calendar{
+  width: 50%!important;
   background: #fff;
 }

index.html

@@ -138,8 +138,12 @@
         </div>
         <div class="m-con">
             <i class="iconfont iconquxiao"></i>
-            <video id="monitor" controls></video>
-		    <div id="calendar"></div>
+            <div class="monitorbody">
+                <div class="mvideo">
+                    <video id="monitor" controls></video>
+                </div>
+                <div id="calendar"></div>
+            </div>
         </div>
     </div>
     <div id="popup">
@@ -885,7 +889,15 @@
         <div class="hard-body">
             <table id="gridtb"></table>
         </div>
-        
+        <div class="m-con">
+            <i class="iconfont iconquxiao"></i>
+            <div class="monitorbody">
+                <div class="mvideo">
+                    <video id="monitor" controls></video>
+                </div>
+                <div id="calendar"></div>
+            </div>
+        </div>
     </div>
     <script>
         if(number == "TEST"){

js/lib/sys-calendar.js

@@ -84,6 +84,7 @@ Calendar.prototype = {
             var modeText = $(this).text();
             var mode = modeText == "月" ? "month" : "year";
             me.changeMode(mode);
+            console.log(mode,11111111);
         })
         //calendar-cell日期点击事件
         el.on("click", ".calendar-cell", function (e) {

js/showHardware.js

@@ -408,7 +408,7 @@ $(function () {
       });
   }
 
-  loadCalendar({
+  window.loadCalendar({
     data:[{
         'startDate': "2021-5-18",//有监控的日期
         id:'传对应的id'