Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/scene_wisdom

css/hardware.css

@@ -344,4 +344,8 @@
 
 .histcon > ul li:hover{
   background: #24D0B8;
-}
+}
+
+.histcon > ul .active{
+  background: #24D0B8;
+}

css/record.css

@@ -216,7 +216,7 @@
 
 .btn-group {
 	float: left;
-	display: inline;
+	display: none;
 	padding: 0 8px;
 }
 

js/lib/sys-calendar.js

@@ -131,6 +131,7 @@ Calendar.prototype = {
             e.stopPropagation();
             var eve=me.eve(e);
         	var parent= eve.parentNode;
+            console.log($(parent));
             $(parent).find(".dropdown-month").removeClass("open");
             $(parent).find(".dropdown-year").toggleClass("open");
             //创建下拉数据

js/showHardware.js

@@ -415,6 +415,9 @@ $(function () {
 
   window.loadHistoryList = function (params={}) {
     let {data=[],clickItem=()=>{}} =  params
+    if (!data||data.length<=0) {
+      return $('.histcon').hide()
+    }
     let html = ''
 
     for (let i = 0; i < data.length; i++) {
@@ -425,6 +428,7 @@ $(function () {
     $('#hislist').html(html) 
     $('#hislist').on('click','li',function(e){
       let i = $(e.target).data('val')
+      $(e.target).addClass('active').siblings().removeClass('active')
       clickItem(data[i])
     })