修改bug

VisualInspection/js/main.js

@@ -4,6 +4,7 @@ $(document).ready(function () {
 
 
     setletftime();
+    getServerTime();
 
     $('#treeMenu').on('click', 'a', function () {
         if ($(this).hasClass("p_m")) { return; }

VisualInspection/js/mytask/check.js

@@ -46,7 +46,8 @@ function initCheck() {
         initCheckAppealBtns();
         setFeSelect("#fsList", $.checkTask.checked_dept);
       
-        $("#lane").val($.checkTask.checked_location);
+        $("#lane").val($.checkTask.checked_location);      
+        $("#check_time").val($.checkTask.check_period);
         // setLaneSelect("#lane", $.checkTask.checked_location);
         get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function(data) {
                 changePersonContent(data);

VisualInspection/js/statistics/assess_ranking.js

@@ -225,9 +225,11 @@ function addTask(userid, username, start_date, end_date) {
                         hasmin = true;
                     }
 
+                    var name = (new Date(tasktemp.start_time)).Format("HH:mm") + "--"+(new Date(tasktemp.end_time)).Format("HH:mm")
                     var classname = "btn-success";
                     if(hasmin){
-                        classname = "disabled";
+                        classname = "btn-success disabled";
+                        name +="<span class=\"label label-badge\">未</span>";
                     }
                     if(hasin){
                         classname = "btn-danger disabled";
@@ -239,7 +241,6 @@ function addTask(userid, username, start_date, end_date) {
                      
                     var teamid = tasktemp.class_id +"_"+ ( typeof(tasktemp.unregular_id)=="undefined"?"":tasktemp.unregular_id)
                     
-                    var name = (new Date(tasktemp.start_time)).Format("HH:mm") + "--"+(new Date(tasktemp.end_time)).Format("HH:mm")
                     if(tasktemp.class_type==1){
                          html1+="<div class='row'><button class=\"btn "+classname+" classbtn\" id="+teamid+" data="+workday+" onclick='selectTeamClass(this)'  type=\"button\">"+name+"</button></div>"
 
@@ -377,13 +378,14 @@ function addTask(userid, username, start_date, end_date) {
             '</table></div>';
 
 
-        var tips = '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#3280FC"/><div class="col-xs-10">排班已被稽查</div></div>'+
+        var tips = '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#ea644a"/><div class="col-xs-10">排班已被稽查</div></div>'+
                 //    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#F1A325"/><div class="col-xs-10">已稽查但排班被删除</div></div>'+
                    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#03B8CF"/><div class="col-xs-10">排班已稽查但任务无效</div></div>'+
                 //    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#BD7B46"/><div class="col-xs-10">已稽查但任务无效且排班已删除</div></div>'+
                    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#38B03F"/><div class="col-xs-10">排班可被稽查</div></div>'+
-                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#f2f2f2"/><div class="col-xs-10">排班未满15分钟</div></div>'+
-                   '<div class="row" style="text-align: left;"><span class=\"label label-badge\">删</span> 排班已删除</div>';
+                //    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#7EC377"/><div class="col-xs-10">排班未满15分钟</div></div>'+
+                   '<div class="row" style="text-align: left;"><span class=\"label label-badge\">删</span> 排班已删除</div>'+
+                   '<div class="row" style="text-align: left;"><span class=\"label label-badge\">未</span> 排班未满15分钟</div>';
 
         
         var selectdiv = '<div class="row" style="text-align: left;"><div class="col-xs-10">已选择的排班：</div></div>'+

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -220,7 +220,7 @@
         date_time();
         $("#save_user_class").click(function(){
 
-            var now_date = new Date();
+            var now_date = moment(nowStr).toDate();//new Date();
             now_date.setDate(now_date.getDate()-1);
             if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim() ){
                 tip("不能生成过期的排班");
@@ -605,7 +605,7 @@
 
         $("#save_term_class").click(function(){
             // 判断当前时间和待添加班组时间判断
-            var now_date = new Date();
+            var now_date = moment(nowStr).toDate();//new Date();
             now_date.setDate(now_date.getDate()-1);
             if(now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim() ){
                 tip("不能生成过期的排班");

VisualInspection/js/util/util.js

@@ -554,4 +554,25 @@ function getTags(url,div,tagDiv,field){
             $(div).html(str);
         }
     });
+}
+
+var nowStr;
+function getServerTime(){
+    get_common_service("/comm/getTime", "", function(data){
+        nowStr=data;
+        gettime();
+    });
+}
+function gettime(){
+    nowStr = moment(nowStr).add(1, 's').format('YYYY-MM-DD HH:mm:ss');
+    // console.log("时间："+nowStr);
+    settime();
+}
+function settime() {        
+    nowStr = moment(nowStr).format('YYYY-MM-DD HH:mm:ss');
+    $("#time_p").html(nowStr);
+    $("#main").css("min-height", window.innerHeight);
+    var height = window.innerHeight - $("#main").height();
+    $("#foot").css("bottom", height > 0 ? 0 : height);
+    setTimeout(gettime, 1000);
 }

VisualInspection/view/common/commonscriptlink.html

@@ -30,15 +30,8 @@
 
 <script type="text/javascript">
     $(document).ready(function() {
-
-        settime();
+        // getServerTime();
+        // gettime();
     });
-
-    function settime() {
-        $("#time_p").html(moment().format('YYYY-MM-DD  HH:mm:ss dddd'))
-        $("#main").css("min-height", window.innerHeight)
-        var height = window.innerHeight - $("#main").height();
-        $("#foot").css("bottom", height > 0 ? 0 : height);
-        setTimeout(settime, 100);
-    }
+    
 </script>

VisualInspection/view/mytask/check.html

@@ -3,23 +3,34 @@
     <div class="row">
         <form class="form-horizontal">
             <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">收费站</label>
-                <div class="col-sm-2">
-                    <select class="form-control" id="fsList" disabled="disabled">
-                        
-                    </select>
+                <div class="form-group col-sm-3">
+                    <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>
-                <label for="exampleInputAccount1" class="col-sm-1">车道号</label>
-                <div class="col-sm-2">
-                    <!--<select class="form-control" id="lane" disabled="disabled"></select>-->
-                    <input type="text" class="form-control" id="lane" disabled="disabled" />
+                <div class="form-group col-sm-1">
+                    <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>
-                <label class="col-sm-1">考核人员</label>
-                <div class="col-sm-3" id="user_img_container">
-                    <!-- 使用图片 -->
-                    <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>
+                <div class="form-group col-sm-3">
+                    <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">
+                    <label class="col-sm-3">考核人员</label>
+                    <div class="col-sm-9" id="user_img_container">
+                        <!-- 使用图片 -->
+                        <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>
+                    </div>
                 </div>
                 <div class="col-sm-1">
                     <button class="btn btn-primary " type="button" onclick="showChangeUser()">更改考核人员</button>

VisualInspection/view/mytask/taskDetail.html

@@ -63,6 +63,7 @@
             <button id="appealBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
             <button id="assignBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAssign()">分配</button>
             <button id="backBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2Check()">退回重新稽查</button>
+            <button id="backAppealBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2AppealCheck()">退回重新复查</button>
             <button id="backConfirmBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2Confirm()">退回重新确认</button>
         </div>
     </div>
@@ -135,6 +136,7 @@
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_17",["#submitAppealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_4",["#backBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_6",["#backConfirmBtn"]);
+        $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_14",["#backAppealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_11",["#assignBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_STATION_ADMIN+"_5",["#confirmBtn","#appealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_STATION_ADMIN+"_15",["#confirmAppealBtn"]);
@@ -459,4 +461,21 @@
             // changePage("/view/mytask/task_list.html?status=6");
         });
     }
+
+    function back2AppealCheck(){
+        //退回到待提交页面
+        var param = {
+            "id": $.checkTask.id,
+            "check_status":13,
+            "check_status_name":"退回"
+        }
+        no_return_common_service("/task/update/",param,function(data){
+             layer.msg("退回成功", {
+                time: 2000//20s后自动关闭
+             });
+            var currentpage = $.zui.store.get("currentpage");
+            getPageInfo(currentpage);
+            // changePage("/view/mytask/task_list.html?status=4");
+        });
+    }
     </script>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CommonController.java

@@ -0,0 +1,25 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@RestController
+@RequestMapping("/comm")
+public class CommonController extends BaseController{
+
+	 @RequestMapping(value = "/getTime")
+    public String getTime(Model model, HttpServletRequest request){
+        Date now = new Date();
+        return super.returnSuccessResult("添加成功",now,"yyyy-MM-dd HH:mm:ss");
+    }
+
+}