修改bug

VisualInspection/js/mytask/check.js

@@ -154,14 +154,14 @@ function fullscreen() {
         '                                                                          </span>' +
         '                                                                      </div>' +
         '                                                                     </div>' +
-        '                                    <div class="btn-group" style="float:right;">' +
-        '                                        <button type="button" class="btn btn-info" onclick="doAction(\'start\')"><i class="icon icon-play-circle icon-2x"></i></button>' +
-        '                                        <button type="button" class="btn btn-info" onclick="doAction(\'stop\')"><i class="icon icon-pause icon-2x"></i></button>' +
-        '                                        <button type="button" class="btn btn-info" onclick="doAction(\'fast\')"><i class="icon icon-forward icon-2x"></i><span id=\"full_fast_info\"></span></button>' +
-        '                                        <button type="button" class="btn btn-info" onclick="doAction(\'slow\')"><span id=\"full_slow_info\"></span><i class="icon icon-backward icon-2x"></i></button>' +
-        '                                        <button type="button" class="btn btn-danger " style="width:51px;height:42px" id="full_video_btn_start" onclick="doAction(\'video_start\')"><img style="width:30px" src="/images/movie.png"></img></i></button>' +
-        '                                        <button type="button" class="btn btn-danger hidden" style="width:51px;height:42px" id="full_video_btn_stop" onclick="doAction(\'video_stop\')"><i class="icon icon-stop icon-2x"></i></button>' +
-        '                                        <button type="button" class="btn btn-success" onclick="doAction(\'screenshot\')"><i class="icon icon-camera icon-2x"></i></button>' +
+        '                                    <div class="btn-group1" style="float:right;">' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'start\')"><i class="icon icon-play-circle icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'stop\')"><i class="icon icon-pause icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'fast\')"><i class="icon icon-forward icon-2x"></i><span id=\"full_fast_info\"></span></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'slow\')"><span id=\"full_slow_info\"></span><i class="icon icon-backward icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" style="width:51px;height:42px" id="full_video_btn_start" onclick="doAction(\'video_start\')"><img id="full_video_btn_start_img" style="width:30px" src="/images/movie.png"></img></i></button>' +
+        '                                        <button type="button" class="btn btn-info1 hidden" style="width:41px;height:41px" id="full_video_btn_stop" onclick="doAction(\'video_stop\')"><i class="icon icon-stop icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'screenshot\')"><i class="icon icon-camera icon-2x"></i></button>' +
         '                                    </div>' +
         '                                </div>';
 
@@ -184,6 +184,13 @@ function fullscreen() {
                 setVideoProcess(slideEvt.value);
             });
 
+            $("#full_video_btn_start").mouseover(function(){
+				$("#full_video_btn_start_img").attr("src","/images/movie.png");
+			});
+			$("#full_video_btn_start").mouseout(function(){
+				$("#full_video_btn_start_img").attr("src","/images/video.png");
+            });
+            
             $("#full_ex1").on("change", function(sender) {
                 var width = $("#full_ex1").siblings(".slider").children(".slider-track").children(".slider-selection").width();
                 var total_width = $("#full_ex1").siblings(".slider").children(".slider-track").width();
@@ -682,7 +689,7 @@ function resetUserImgInfo() {
     var str = '<a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle">' +
         '<img src="../../images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>' +
         '<label id="checked_person"></label>' +
-        '（次数：<a href="javascript:void(0)" onclick="showCheckDetailCount()"><label id="checked_count"></label></a>）';
+        '(次数：<a href="javascript:void(0)" onclick="showCheckDetailCount()"><label id="checked_count"></label></a>)';
     $("#user_img_container").html(str);
 }
 

VisualInspection/js/role/role.js

@@ -58,7 +58,7 @@ $(document).ready(function () {
         }
         if (this.name == "user_delete") {
             var roleId = this.id;
-            deleteItem4Common(function(){
+            deleteItem4CallBack(function(){
                 RoleDelete(roleId, function (data) {
                     getrole(pagesize, 1);
                     layer.msg('角色删除成功！', {

VisualInspection/js/statistics/change_work.js

@@ -117,7 +117,7 @@ function getTableContent(obj,seq){
     }
 
     var content = "<tr><td width='8%'>" + seq + "</td> <td  width='16%'>" + obj.feeStationName + "</td> <td  width='16%'>" + obj.userName +
-        "</td> <td  width='16%'>" + obj.positionName + "</td><td>" + GDV(map_class[3], 0) + "</td><td>" + GDV(map_class[1], 0) + "</td><td>" + GDV(map_class[2], 0) + "</td><td width='16%'>" + workdays + "</td><td width='16%'>" + "</td> </tr>";
+        "</td> <td  width='16%'>" + obj.positionName + "</td><td width='50px'>" + GDV(map_class[3], 0) + "</td><td width='50px'>" + GDV(map_class[1], 0) + "</td><td width='50px'>" + GDV(map_class[2], 0) + "</td><td width='16%'>" + workdays + "</td><td>" + "</td> </tr>";
 
     return content;
 }

VisualInspection/view/mytask/check.html

@@ -2,28 +2,28 @@
 <div class="container-fluid ">
     <div class="row">
         <form class="form-horizontal">
-            <div class="form-group">
-                <div class="form-group col-sm-3">
+            <div class="form-group" style="margin-bottom: 5px;">
+                <div class="form-group col-sm-3" style="margin-bottom: 0px;">
                     <label for="exampleInputAccount1" class="col-sm-3">收费站</label>
                     <div class="col-sm-9">
                         <select class="form-control col-sm-7" id="fsList" disabled="disabled">
                         </select>
                     </div>
                 </div>
-                <div class="form-group col-sm-1">
+                <div class="form-group col-sm-1" style="margin-bottom: 0px;">
                     <div class="col-sm-12">
                         <!--<select class="form-control" id="lane" disabled="disabled"></select>-->
                         <input type="text" class="form-control" id="lane" disabled="disabled" />
                     </div>
                 </div>
-                <div class="form-group col-sm-3">
+                <div class="form-group col-sm-3" style="margin-bottom: 0px;">
                     <label for="exampleInputAccount1" class="col-sm-3">时间</label>
                     <div class="col-sm-9">
                         <!--<select class="form-control" id="lane" disabled="disabled"></select>-->
                         <input type="text" class="form-control" id="check_time" disabled="disabled" />
                     </div>
                 </div>
-                <div class="form-group col-sm-4">
+                <div class="form-group col-sm-4" style="margin-bottom: 0px;">
                     <label class="col-sm-3">考核人员</label>
                     <div class="col-sm-9" id="user_img_container">
                         <!-- 使用图片 -->
@@ -33,7 +33,7 @@
                     </div>
                 </div>
                 <div class="col-sm-1">
-                    <button class="btn btn-info2 " type="button" onclick="showChangeUser()">更改考核人员</button>
+                    <button class="btn btn-info2 " type="button" onclick="showChangeUser()">更改考核人</button>
                 </div>
 
             </div>

VisualInspection/view/statistics/change_work.html

@@ -70,11 +70,11 @@
                 <th  width="16%">站名</th>
                 <th  width="16%">姓名</th>
                 <th  width="16%">岗位</th>
-                <th>夜</th>
-                <th>早</th>
-                <th>中</th>
+                <th width="50px">夜</th>
+                <th width="50px">早</th>
+                <th width="50px">中</th>
                 <th  width="16%">合计</th>
-                <th  width='16%'>备注</th>
+                <th>备注</th>
             </tr>
             </thead>
             <!-- <tbody class="table-tbody" style="background:white" align="center" height="500px">