no message

VisualInspection/css/main.css

@@ -153,9 +153,9 @@ a:focus {
 
 .btn-info3 {
     color: #fff;
-    background-color: #38b03f;
+    background-color: #2EA98C;
     border-radius: 4px;
-    border-color: #38b03f;
+    border-color: #2EA98C;
     text-shadow: none;
 }
 
@@ -172,9 +172,9 @@ a:focus {
 
 .btn-info4 {
     color: #fff;
-    background-color: #B71C1C;
+    background-color: #D99182;
     border-radius: 4px;
-    border-color: #B71C1C;
+    border-color: #D99182;
     text-shadow: none;
 }
 

VisualInspection/fwq/js/task/add.js

@@ -18,6 +18,7 @@ $(document).ready(function() {
     var dd = 89;
     if ($("#fwq").val() != "") {
         dd = $("#fwq").val();
+        //console.log(dd);
     }
     inittAreaable($("#month_date").val(), dd);
 
@@ -73,7 +74,7 @@ function inittAreaable(time, dept) {
 
     var param1 = { "start_time": starttime.format("YYYY-MM-DD HH:mm:ss"), "end_time": endtime.format("YYYY-MM-DD HH:mm:ss"), "checked_dept": dept }
     post_common_service("/f/task/getall/0/0", param1, function(taskdata) {
-
+       // console.log(taskdata);
         taskMap = new HashMap();
         taskdata.forEach(t => {
             var key = t.area_id + "_" + moment(t.start_time).format("YYYY-MM-DD");
@@ -173,7 +174,7 @@ function inittAreaable(time, dept) {
                 }
                 datac.array.push(data_table);
             }
-
+             console.log(datac);
             if (tabledatagride != null) {
                 tabledatagride.dataSource.data = null;
                 tabledatagride.setDataSource(datac);
@@ -186,7 +187,18 @@ function inittAreaable(time, dept) {
                     showRowIndex: false,
 
                     onRender: function() {
-
+                        $(".datagrid-cell-index").mouseover(function(){
+                            var id = this.id.split("-")[4]-1;
+                            var titlehtml = "<div>"+datac.array[id].type+"</div>";
+                            layer.tips(titlehtml, "#" + this.id, {
+                                tips: [1, '#8e8e8e'],
+                                time: 0,
+                                width: '240px'
+                            }); 
+                        });
+                        $(".datagrid-cell-index").mouseout(function() {
+                            layer.close(layer.index);
+                        });
 
 
                         $(".btn_c").mouseover(function() {
@@ -223,12 +235,15 @@ function inittAreaable(time, dept) {
                         $(".btn_c").mouseout(function() {
                             layer.close(layer.index);
                         });
+                        
 
 
                     },
                     configs: {
-                        C1: { className: "datagrid-cell-index", style: { 'text-align': 'center', } },
+                        C1: { className: "datagrid-cell-index", style: { 'text-align': 'center',},},
                         R0: { style: { 'text-align': 'center', 'line-height': '36px' } }
+                        //R1C1:{html:"<div>1111</div>"}
+                        
                     }
                 });
                 tabledatagride = $('#table_s').data('zui.datagrid');

VisualInspection/fwq/view/task/task_list.html

@@ -20,9 +20,9 @@
                 </div>
 
 
-                <div class="form-group col-sm-2">
+                <div class="form-group col-sm-2" style="float:right;">
                     <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()">查询</button>
-                    <div id="dispatchPatchBtn" class="col-sm-1" style="display:none;">
+                    <div id="dispatchPatchBtn" class="col-sm-1" style="display:block;">
                         <button class="btn btn-info3" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-signin"></i> 批量下发</button>
                     </div>
                     <div id="confirmPatchBtn" class="col-sm-1" style="display:none;">
@@ -32,7 +32,7 @@
             </div>
             <div class="form-group" style="margin:0px;">
                 <div id="hasScoreDiv" style="display:none;" class="form-group col-sm-3">
-                    <label for="exampleInputAccount1" class="col-sm-4">有无扣分</label>
+                    <label for="exampleInputAccount1" class="col-sm-4" style="text-align: left">有无扣分</label>
                     <div class="col-sm-8">
                         <select class="form-control" id="hasScoreList">
                             <option value="" selected>全部</option>
@@ -41,12 +41,10 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group col-sm-2">
-                </div>
-                <div class="form-group col-sm-2">
+                <div class="form-group col-sm-2" style="float: right;">
                     <div class="form-group col-sm-1">
                     </div>
-                    <div id="dispatchAllNoScoreBtn" class="col-sm-1" style="display:none;padding:0px;">
+                    <div id="dispatchAllNoScoreBtn" class="col-sm-1" style="display:block;padding:0px;">
                         <button class="btn btn-info4" type="button" onclick="dispatchAllNoScoreTask()"><i class="icon icon-signin"></i> 下发无扣分任务</button>
                     </div>
                 </div>

VisualInspection/js/main.js

@@ -39,21 +39,21 @@ $(document).ready(function() {
     if (pathName.indexOf("fwq") != -1) {
         //服务区稽查
         mbody.type = 20;
-       var deptname ="(服务区)";
+       var deptname ="服务区稽查";
 
     } else if (pathName.indexOf("qzd") != -1) {
         //清障队
         mbody.type = 30;
-        var deptname="(清障队)";
+        var deptname="清障队稽查";
 
     } else if (pathName.indexOf("cd") != -1) {
         //车队
         mbody.type = 40;
-        var deptname="(车队)";
+        var deptname="车队稽查";
     } else {
         //收费站
         mbody.type = 10;
-        var deptname="(收费站)";
+        var deptname="收费站稽查";
 
     }
     //获取用户信息
@@ -67,7 +67,8 @@ $(document).ready(function() {
 
         return;
     } else {
-        var html = "<i class=\"icon icon-user\"></i>  " + user.truename + " " + user.organname +deptname+ ",欢迎您"
+        document.getElementById("deptname").innerHTML = deptname;
+        var html = "<i class=\"icon icon-user\"></i>  " + user.truename + " " + user.organname + ",欢迎您"
         $("#user").html(html);
     }
 

VisualInspection/view/common/head.html

@@ -7,6 +7,9 @@
             <li>
                 <img src="/images/logo_name1.png" />
             </li>
+            <li>
+                <p id="deptname" class="header_font" style="padding-right:20px;cursor:pointer;margin-left: 200px"></p>
+            </li>
         </ul>
 
 
@@ -15,16 +18,20 @@
             <li>
 
                 <p id="user" onclick="update_user_info_data()" class="header_font" style="padding-right:20px;cursor:pointer;"></p>
-
-                <!-- <p id="user" class="header_font" style="padding-right:20px;cursor:pointer;"></p> -->
             </li>
             <li>
+                    <p id="header_title" class="header_font"></p>
+                </li>
+            <li>
                 <p id="time_p" class="header_font"></p>
             </li>
 
             <li>
                 <button class="header_font logout_btn " id="login_out_btn"> <i class="icon icon-signout" style="font-size: 24px;"></i> </button>
             </li>
+            <li>
+                <button class="header_font logout_btn " id="login_out_btn" onclick="gohome()"> <i class="icon icon-home" style="font-size: 24px;"></i> </button>
+            </li>
         </ul>
     </div>
 </div>

VisualInspection/view/home.html

@@ -75,11 +75,11 @@
                                 <div class="row" id="" style="margin-top: 50px">
                                         <div onclick="opennew(1,null)" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground1" style="height: 200px"><p style="padding-top:70px;margin-right:40px"><img src="/images/service.png" style="height:80px;width:80px;"></img>服务区稽查</p></div></div>
                                         <div onclick="opennew(0,null)" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground2" style="height: 200px"><p style="padding-top:70px;margin-right:40px"><img src="/images/plan.png" style="height:80px;width:80px;"></img></img>收费站稽查</p></div></div>
-                                        <div onclick="" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground4" style="height: 200px"><p style="padding-top:70px;margin-right:40px"><img src="/images/claean.png" style="height:80px;width:80px;"></img>清障队稽查</p></div></div>
+                                        <div onclick="" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground4" style="height: 200px"><p style="padding-top:70px;margin-right:40px;"><img src="/images/repair.png" style="height:80px;width:80px;"></img>清障队稽查</p></div></div>
                                 </div>
                                 <div class="row" id="" style="margin-top: 50px">
-                                        <div onclick="" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground4" style="height: 200px"><p style="padding-top:70px;margin-right:40px"><img src="/images/car.png" style="height:80px;width:80px;"></img>车队稽查</p></div></div>
-                                        <div onclick="" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground4" style="height: 200px"><p style="padding-top:70px;margin-right:40px"><img src="/images/data.png" style="height:80px;width:80px;"></img>统计分析</p></div></div>
+                                        <div onclick="" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground4" style="height: 200px"><p style="padding-top:70px;margin-right:40px;"><img src="/images/car.png" style="height:80px;width:80px"></img>车队稽查</p></div></div>
+                                        <div onclick="" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground4" style="height: 200px"><p style="padding-top:70px;margin-right:40px"><img src="/images/area-chart.png" style="height:80px;width:80px;"></img>统计分析</p></div></div>
                                         <div onclick="opennew(0,'14')" class="col-md-3" style="text-align: center;margin-left:80px"><div class="colorbackground3" style="height: 200px"><p style="padding-top:70px;margin-right:40px"><img src="/images/wood.png" style="height:80px;width:80px;"></img>配置管理</p></div></div>
                                 </div>        
                             </div>