ui修改

VisualInspection/js/main.js

@@ -32,7 +32,30 @@ $(document).ready(function() {
 
         // myTree.expand($li)
     });
+    var pathName = window.document.location.pathname;
+    var mbody = {
+        type: 10
+    };
+    if (pathName.indexOf("fwq") != -1) {
+        //服务区稽查
+        mbody.type = 20;
+       var deptname ="(服务区)";
+
+    } else if (pathName.indexOf("qzd") != -1) {
+        //清障队
+        mbody.type = 30;
+        var deptname="(清障队)";
+
+    } else if (pathName.indexOf("cd") != -1) {
+        //车队
+        mbody.type = 40;
+        var deptname="(车队)";
+    } else {
+        //收费站
+        mbody.type = 10;
+        var deptname="(收费站)";
 
+    }
     //获取用户信息
     var user = $.zui.store.get("user")
     if (user == null || typeof(user) == "undefined") {
@@ -44,7 +67,7 @@ $(document).ready(function() {
 
         return;
     } else {
-        var html = "<i class=\"icon icon-user\"></i>  " + user.truename + " " + user.organname + ",欢迎您"
+        var html = "<i class=\"icon icon-user\"></i>  " + user.truename + " " + user.organname +deptname+ ",欢迎您"
         $("#user").html(html);
     }
 
@@ -70,26 +93,30 @@ $(document).ready(function() {
 
 
     //判断路径中是否包含其他稽查的路径
-    var pathName = window.document.location.pathname;
-    var mbody = {
-        type: 10
-    };
-    if (pathName.indexOf("fwq") != -1) {
-        //服务区稽查
-        mbody.type = 20;
-
-    } else if (pathName.indexOf("qzd") != -1) {
-        //清障队
-        mbody.type = 30;
+    // var pathName = window.document.location.pathname;
+    // var mbody = {
+    //     type: 10
+    // };
+    // if (pathName.indexOf("fwq") != -1) {
+    //     //服务区稽查
+    //     mbody.type = 20;
+    //     document.getElementById("header_title").innerHTML="(服务区)";
+
+    // } else if (pathName.indexOf("qzd") != -1) {
+    //     //清障队
+    //     mbody.type = 30;
+    //     document.getElementById("header_title").innerHTML="(清障队)";
+
+    // } else if (pathName.indexOf("cd") != -1) {
+    //     //车队
+    //     mbody.type = 40;
+    //     document.getElementById("header_title").innerHTML="(车队)";
+    // } else {
+    //     //收费站
+    //     mbody.type = 10;
+    //     document.getElementById("header_title").innerHTML="(收费站)";
 
-    } else if (pathName.indexOf("cd") != -1) {
-        //车队
-        mbody.type = 40;
-    } else {
-        //收费站
-        mbody.type = 10;
-
-    }
+    // }
     MenuGetAll(function(data) {
         var secondMenus = [];
         //初始化菜单

VisualInspection/js/new.js

@@ -359,9 +359,9 @@ function menusuccess(data) {
             //console.log(setcontent);
             //console.log(menu[i].iconClass);
             // var html = ' <div class="col-md-1" style="text-align: center"><buuton type="button" class="btn btn-primary" data-toggle="modal" data-target="#myLgModal" style="background-color: #86C7D8;border-radius: 10px;height:80px;width:80px" href="#" ><img class="imgsize" src="/images/'+menu[i].iconClass+'.png"/></button><br/><font style="">'+menu[i].menuname+'</font></div>';
-            var html = ' <div onclick="setdiv(' + j + ',' + i + ')" class="col-md-1" style="text-align: center"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/' + menu[i].iconClass + '.png"/></button><br/><font>' + menu[i].menuname + '</font></div>';
+            var html = ' <div onclick="setdiv(' + j + ',' + i + ')" class="col-md-1" style="text-align: center;margin-left:30px"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/' + menu[i].iconClass + '.png"/></button><br/><font>' + menu[i].menuname + '</font></div>';
             if (menu[i].type == 30) {
-                html = ' <div onclick="noApp()" class="col-md-1" style="text-align: center"><button  style="background-color:#2c2d3096;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/' + menu[i].iconClass + '.png"/></button><br/><font>' + menu[i].menuname + '</font></div>';
+                html = ' <div onclick="noApp()" class="col-md-1" style="text-align: center;margin-left:30px"><button  style="background-color:#2c2d3096;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/' + menu[i].iconClass + '.png"/></button><br/><font>' + menu[i].menuname + '</font></div>';
             }
             if (menu[i].iconClass == "desktop") {
                 html = '';
@@ -375,25 +375,28 @@ function menusuccess(data) {
 }
 
 function setdiv(a, b) {
-    var divhtml = '';
+    var divhtml = ' <div class="row" id="">';
     var divhtml2 = '';
-<<<<<<< HEAD
     console.log(zMenu[a][b]);
    for(var i=0;i<zMenu[a][b].length;i++){
-        var html ='<div class="col-md-1" style="text-align: center;margin-left:10px;margin-top:20px"><button style="width:60px;height:60px;background-color: #366ba5;border-radius: 10px" onclick="opennew(\''+a+'\',\''+zMenu[a][b][i].id+'\')" ><img style="height:40px;width:40px;" src="/images/'+zMenu[a][b][i].iconClass+'.png"/></button><br/><font>'+zMenu[a][b][i].menuname+'</font></div>';
-        divhtml = divhtml +html;
+       var html = '';
+       if((i+1)%3 == 0){
+           html = ' <div class="row" id="">';
+       }
+        html = html +'<div class="col-md-3" style="text-align: center;margin-left:20px;margin-top:20px"><button style="width:60px;height:60px;background-color: #366ba5;border-radius: 10px" onclick="opennew(\''+a+'\',\''+zMenu[a][b][i].id+'\')" ><img style="height:40px;width:40px;" src="/images/'+zMenu[a][b][i].iconClass+'.png"/></button><br/><font>'+zMenu[a][b][i].menuname+'</font></div>';
+        if((i+1)%3 ==0){
+            html = html + "</div>";
+        } 
+       divhtml = divhtml +html;
     }   // $("modal").append(html);
-=======
-    for (var i = 0; i < zMenu[a][b].length; i++) {
-        var html = '<div class="col-md-1" style="text-align: center;margin-left:10px;margin-top:20px"><button style="width:60px;height:60px;background-color: #366ba5;border-radius: 10px" onclick="opennew(\'' + a + '\',\'' + zMenu[a][b][i].id + '\')" ><img style="height:40px;width:40px;" src="/images/' + iconObj[a][b].iconClass + '.png"/></button><br/><font>' + zMenu[a][b][i].menuname + '</font></div>';
-        divhtml = divhtml + html;
-    } // $("modal").append(html);
->>>>>>> 291ea3cc20068504e0a65482cc957dffe5e100d4
+    if(zMenu[a][b].length %3 != 0){
+        divhtml = divhtml +'</div>';
+    }
     layer.open({
         type: 1,
         title: iconObj[a][b].menuname,
         skin: 'layui-layer-rim', //加上边框
-        area: ['918px', '300px'], //宽高
+        area: ['400px', '400px'], //宽高
         content: divhtml
     });
 }

VisualInspection/view/new.html

@@ -122,11 +122,11 @@
                             <br/> 
                                 <div >
                                         <div class="row" id="appbase" style="">
-                                                <div onclick="opennew('0','14')" class="col-md-1" style="text-align: center"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/user.png"/></button><br/><font>用户管理</font></div>
-                                                <div onclick="opennew('0','15')" class="col-md-1" style="text-align: center"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/roler.png"/></button><br/><font>角色管理</font></div>
-                                                <div onclick="opennew('0','16')" class="col-md-1" style="text-align: center"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/permission.png"/></button><br/><font>权限管理</font></div>
-                                                <div onclick="opennew('0','17')" class="col-md-1" style="text-align: center"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/menu.png"/></button><br/><font>菜单管理</font></div>
-                                                <div onclick="opennew('0','18')" class="col-md-1" style="text-align: center"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/constant.png"/></button><br/><font>常量管理</font></div>
+                                                <div onclick="opennew('0','14')" class="col-md-1" style="text-align: center;margin-left:30px"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/user.png"/></button><br/><font>用户管理</font></div>
+                                                <div onclick="opennew('0','15')" class="col-md-1" style="text-align: center;margin-left:30px"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/roler.png"/></button><br/><font>角色管理</font></div>
+                                                <div onclick="opennew('0','16')" class="col-md-1" style="text-align: center;margin-left:30px"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/permission.png"/></button><br/><font>权限管理</font></div>
+                                                <div onclick="opennew('0','17')" class="col-md-1" style="text-align: center;margin-left:30px"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/menu.png"/></button><br/><font>菜单管理</font></div>
+                                                <div onclick="opennew('0','18')" class="col-md-1" style="text-align: center;margin-left:30px"><button  style="background-color:#366ba5;border-radius: 10px;height: 80px;width: 80px" type="button"><img style="" src="/images/constant.png"/></button><br/><font>常量管理</font></div>
 
                                         </div>         
                                 </div>