Merge branch 'master' into 'dev'

# Conflicts:
#   static/js/public.js
#   static/js/xcjc.js

pages/zjjc.html

@@ -68,12 +68,20 @@
     </div>
 
     <div id="popup-info" class="hidden popup-info"></div>
+    <img style="position:fixed;bottom: 0;left:50%; width:30px;cursor: pointer;transform: translateX(-50%);display: none;"
+        class="show-arrow" onclick="getBottomData.showBottom()" src="../static/images/icon_shang.png" alt="">
     <div class="bottom-item-table">
         <div class="panel-item panel-item2" id="table-bottom">
             <div class="panel-title">
                 <p class="name">异常信息汇总</p>
+                <img style="width: 30px;margin-left:180px;cursor: pointer;" onclick="getBottomData.hideBottom()"
+                    src="../static/images/icon_xia.png" alt="">
                 <div class="value">
+                    <button class="switch prev-month layui-btn layui-btn-normal"
+                        onclick="getBottomData.getPrevMonth()">上月</button>
                     <p class="date" id="bhg-date"><span class="begin">——</span>至<span class="end">——</span></p>
+                    <button class="switch next-month layui-btn layui-btn-normal"
+                        onclick="getBottomData.getNextMonth()">下月</button>
                 </div>
             </div>
             <div class="panel-info">

static/css/dist/zjjc.css

@@ -651,9 +651,6 @@
   color: #FFF;
 }
 
-.panel-item .panel-title .value p {
-  margin-left: .4rem;
-}
 
 .panel-item .panel-title .value .number {
   margin-left: .1rem;
@@ -873,3 +870,10 @@ td {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.switch {
+  height: inherit;
+  padding: 6px 12px;
+  line-height: inherit;
+  background-color: #46A6D8;
+}
\ No newline at end of file

static/js/public.js

@@ -48,7 +48,7 @@ function getHeader() {
     <div class="name">
         <p class="icon_font icon-ilogo-2"></p>
         <p class="icon_font icon-vertical_line"></p>
-        <p><span id='area'></span>建设工程质量智慧监管云平台</p>
+        <p><span id='area' style='display:none;'></span>检测监管云平台</p>
     </div>
     <div class="right-item">
         <div class="tab" id="head-tab">
@@ -89,14 +89,22 @@ function getHeader() {
 
 function getHeaderInfo() {
     $.ajax({
-        url: "http://detect.cnjsjd.net/Ajax/Screen/GetHeaderInfo.ashx",
+        url: "/Ajax/Screen/GetHeaderInfo.ashx",
         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);
@@ -161,13 +169,13 @@ $(function () {
     })
 });
 
-const imgURL = 'http://detect.cnjsjd.net/';
-const baseURL = 'http://detect.cnjsjd.net/Ajax/Screen/Pile/';
-const baseURL_xcjc = 'http://detect.cnjsjd.net/Ajax/Screen/XCJC/';
-const baseURL_jzjc = 'http://detect.cnjsjd.net/Ajax/Screen/JZJC/';
-const baseURL_htjc = 'http://detect.cnjsjd.net/Ajax/Screen/HTJC/';
+const imgURL = '/';
+const baseURL = '/Ajax/Screen/Pile/';
+const baseURL_xcjc = '/Ajax/Screen/XCJC/';
+const baseURL_jzjc = '/Ajax/Screen/JZJC/';
+const baseURL_htjc = '/Ajax/Screen/HTJC/';
 
-const baseURL_Utility = 'http://detect.cnjsjd.net/Ajax/Screen/Utility/';
+const baseURL_Utility = '/Ajax/Screen/Utility/';
 
 window._AMapSecurityConfig = {
     securityJsCode: '0711374220aba81dbf7515aaac08e50b',

static/js/xcjc.js

@@ -168,7 +168,7 @@ var map = {
     },
     getDetail: function(SceneTaskID){
         $.ajax({
-            url: 'http://detect.cnjsjd.net/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id='+SceneTaskID,
+            url: '/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id='+SceneTaskID,
             type: "get",
             success: function(data) {
                 map.setDetail(data);
@@ -270,8 +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

@@ -290,7 +290,7 @@ var map = {
     },
     // 视频通话
     videoConnection(op_code) {
-        showPopup('http://detect.cnjsjd.net/VideoConnection.aspx?target_op_code=' + op_code, '视频通话');
+        window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code=' + op_code);
     }
 }
 
@@ -493,7 +493,7 @@ var getRightdata = {
     },
     get_XCJC_Detail: function (SceneTaskID) {
         $.ajax({
-            url: 'http://detect.cnjsjd.net/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id=' + SceneTaskID,
+            url: '/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id=' + SceneTaskID,
             type: "get",
             success: function (data) {
                 getRightdata.set_XCJC_Detail(data);
@@ -508,16 +508,57 @@ var getRightdata = {
         showPopup('', '静载工程数据详情');
     }
 }
-
+function getMonthDay(year, month) {
+    let days = new Date(year, month + 1, 0).getDate()
+    return days
+}
 var getBottomData = {
     init: function () {
         this.getUnusualDate();
     },
     getUnusualDate: function () {
-        $("#bhg-date .begin").html(getNextDate(dateFormat('YYYY-mm-dd', new Date()), -1));
+        $("#bhg-date .begin").html(getNextDate(dateFormat('YYYY-mm-dd', new Date()), Number('-' + new Date().getDate()) + 1));
         $("#bhg-date .end").html(dateFormat('YYYY-mm-dd', new Date()));
         this.getUnusual();
     },
+    getPrevMonth: function () {
+        var date = new Date($("#bhg-date .begin")[0].innerHTML)
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1
+        if (month == 1) {
+            month = 12
+            year = year - 1
+        } else {
+            month = month - 1
+            if (month < 10) {
+                month = '0' + month
+            }
+        }
+        var lastDay = getMonthDay(year, month)
+        console.log(year, month)
+        $("#bhg-date .begin").html(year + '-' + month + '-' + '01');
+        $("#bhg-date .end").html(year + '-' + month + '-' + lastDay);
+        this.getUnusual();
+    },
+    getNextMonth: function () {
+        var date = new Date($("#bhg-date .begin")[0].innerHTML)
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1
+        if (month == 12) {
+            month = '01'
+            year = year + 1
+        } else {
+            month = month + 1
+            if (month < 10) {
+                month = '0' + month
+            }
+        }
+        var lastDay = getMonthDay(year, month)
+        console.log(year, month)
+        $("#bhg-date .begin").html(year + '-' + month + '-' + '01');
+        $("#bhg-date .end").html(year + '-' + month + '-' + lastDay);
+        this.getUnusual();
+    },
     getUnusual: function () {
         $.ajax({
             url: baseURL_Utility + "UnusualList.ashx?begin_date=" + $("#bhg-date .begin").html() + "&end_date=" + $("#bhg-date .end").html() + "&screen_kind=3",
@@ -578,6 +619,16 @@ var getBottomData = {
             }
         });
     },
+    showBottom: function () {
+        $('.content-bg.content-bg-xia').show()
+        $('.bottom-item-table').show()
+        $('.show-arrow').hide()
+    },
+    hideBottom: function () {
+        $('.content-bg.content-bg-xia').hide()
+        $('.bottom-item-table').hide()
+        $('.show-arrow').show()
+    }
 }
 
 $(function () {