Merge branch 'master' of ssh://111.61.77.35:15/yaqizhang/zanhuangyingji into master

ioc_frontweb/js/utils.js

@@ -627,7 +627,7 @@ function createLegendList() {
             tmpLi +=
               '<li data-id="' +
               items[i].id +
-              '" class="legendItem"><div><img class="legendPic" style="padding: 7px 0;" src="./images/legend/' +
+              '" class="legendItem"><div class="first"><img class="legendPic" style="padding: 7px 0;" src="./images/legend/' +
               items[i].legendCode +
               '.png" alt=""/><span class="legendTitle">' +
               items[i].legendName +
@@ -645,15 +645,15 @@ function createLegendList() {
           var legendchild=document.getElementsByClassName("legendchild");
           for (var i=0; i<legenditem.length;i++){
             // legenditem[i].index = i;
-            legenditem[i].onclick = function(){
-              if(this.lastChild.style.display == "none"){
-                this.style.backgroundImage="url(images/vectorbot.png)";
-                this.lastChild.style.display = "block";
-              }else{
-                this.style.backgroundImage="url(images/re.png)";
-                this.lastChild.style.display = "none";
-              }
-            };
+            // legenditem[i].onclick = function(){
+            //   if(this.lastChild.style.display == "none"){
+            //     this.style.backgroundImage="url(images/vectorbot.png)";
+            //     this.lastChild.style.display = "block";
+            //   }else{
+            //     this.style.backgroundImage="url(images/re.png)";
+            //     this.lastChild.style.display = "none";
+            //   }
+            // };
           }
           // 默认显示视频监控设备
           // $('.legendItem').eq(0).click();

ioc_frontweb/style/style.css

@@ -317,7 +317,7 @@ table.layui-table th {
 .legendItem {
   margin: 3px 0;
   overflow: hidden;
-  cursor: pointer;
+  /* cursor: pointer; */
   float: left;
   background: url(../images/re.png);
   background-size: 100% 100%;
@@ -325,11 +325,16 @@ table.layui-table th {
   padding: 0 5px;
   margin-left: 10px;
 }
+.legendItem .first{
+  cursor: pointer;
+
+}
 .legendchild{
   display: none;
   width: auto;
   position: fixed;
-  bottom: 85px;
+  bottom: 50px;
+  height: 70px;
 }
 /* .legendItem:active + .legendchild{
   display: block;