Merge branch 'dev' into 'master'

Dev

See merge request !7

static/js/public.js

@@ -93,11 +93,18 @@ function getHeaderInfo() {
         type: "get",
         dataType: "json",
         success: function (data) {
+<<<<<<< static/js/public.js
+            if(data.status == 500){
+                window.location="/LoginDirect.aspx";
+                return
+            }
+=======
             if (data.status == 500) {
                 window.location = "/LoginDirect.aspx";
                 return
             }
 
+>>>>>>> static/js/public.js
             $("#op_name").html(data.data[0].op_name);
             $("#area").html(data.data[0].area);
             $("#op_avatar").attr('src', data.data[0].op_avatar);

static/js/xcjc.js

@@ -270,7 +270,12 @@ var getLeftData = {
     },
     // 视频通话
     videoConnection(target_op_code){
+<<<<<<< static/js/xcjc.js
+        window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code='+target_op_code);
+        // showPopup('http://detect.cnjsjd.net/VideoConnection.aspx?target_op_code='+target_op_code, '视频通话');
+=======
         window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code=' + target_op_code);
+>>>>>>> static/js/xcjc.js
     }
 }
 

static/js/zjjc.js

@@ -107,7 +107,7 @@ var map = {
                                                 <div class='status'>
                                                     <p class="${item2.is_online == '1' ? 'active' : ''}" onclick="map.getSnapPictures('${item.pile_id ? item.pile_id : ""}', '${item2.equ_no ? item2.equ_no : ""}', '${item2.is_online ? item2.is_online : ""}')"><span class='icon_font icon-icon_bf_lx-01'></span>播放</p>
                                                     <span class="icon_font icon-vertical_line"></span>
-                                                    <p class="${item2.is_historyvideo == '1' ? 'active' : ''}" onclick="map.getHistoryvideo('${item2.equ_no ? item2.equ_no : ""}', '${dateFormat('YYYY-mm-dd', new Date())}')"><span class='icon_font icon-icon_hf_lx-01'></span>回放</p>
+                                                    <p class="${item2.is_historyvideo == '1' ? 'active' : ''}" onclick="map.getHistoryvideo('${item2.equ_no ? item2.equ_no : ""}', '${getNextDate(dateFormat('YYYY-mm-dd', new Date()), -1)}')"><span class='icon_font icon-icon_hf_lx-01'></span>回放</p>
                                                 </div>
                                             </div>
                                         `)
@@ -200,7 +200,7 @@ var map = {
                                                 <div class='status'>
                                                     <p class="${item3.is_online == '1' ? 'active' : ''}" onclick="map.getSnapPictures('${item2.pile_id ? item2.pile_id : ""}', '${item3.equ_no ? item3.equ_no : ""}', '${item3.is_online ? item3.is_online : ""}')"><span class='icon_font icon-icon_bf_lx-01'></span>播放</p>
                                                     <span class="icon_font icon-vertical_line"></span>
-                                                    <p class="${item3.is_historyvideo == '1' ? 'active' : ''}" onclick="map.getHistoryvideo('${item3.equ_no ? item3.equ_no : ""}', '${dateFormat('YYYY-mm-dd', new Date())}')"><span class='icon_font icon-icon_hf_lx-01'></span>回放</p>
+                                                    <p class="${item3.is_historyvideo == '1' ? 'active' : ''}" onclick="map.getHistoryvideo('${item3.equ_no ? item3.equ_no : ""}', '${getNextDate(dateFormat('YYYY-mm-dd', new Date()), -1)}')"><span class='icon_font icon-icon_hf_lx-01'></span>回放</p>
                                                 </div>
                                             </div>
                                         `)