前台页面逻辑

VisualInspection/js/appeal_management/appeal_checked.js

@@ -0,0 +1,39 @@
+// var page_size=10;
+function queryCheckedAppealTask(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "dept": $("#dept").val(),
+        "status_search_type":1,
+        "check_status":14
+    }
+    var cols = [
+                {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
+                {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},
+                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
+                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
+                // {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
+                //  {width: 80, text: '复核人员', type: 'string', flex: true, colClass: '',field: 'recheckman_name'},
+                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
+                // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
+                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                    oper:[
+                        {func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}
+                    ]
+                }
+            ];
+    
+    // var pager = {
+    //     page_size:10
+    // }
+    $('#checked_datatable').mytable({'cols':cols,
+                            'url':"/checkAppeal/getTaskList/",
+                            'param':data}
+                            );
+}
+
+function showTaskDetail(id){
+    var rowData=getItemByIdFromArr(id,$('#checked_datatable').mytable('getTableData'));
+    $.checkTask = rowData;
+    changePage("/view/mytask/taskDetail.html");
+}

VisualInspection/js/appeal_management/appeal_list.js

@@ -40,13 +40,14 @@ function initQueryParams() {
 }
 //初始化表行按钮
 function initTableRowBtn() {
-    $.zui.store.set("task_table_btn_11",[{func:'seeCheckAudit',text:'处理',icon_class:'icon-phone-sign'}]);
-    $.zui.store.set("task_table_btn_3",[{func:'showContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
-    $.zui.store.set("task_table_btn_4",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'},
-                                        {func:'dispatchTaskById',text:'下发',icon_class:'icon-signin'}]);
-    $.zui.store.set("task_table_btn_5",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
-    $.zui.store.set("task_table_btn_6",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
-    $.zui.store.set("task_table_btn_21",[{func:'showApplyDetail',text:'处理',icon_class:'icon-hand-up'}]);
+    $.zui.store.set("task_table_btn_11",[{func:'seeCheckAudit',text:'处理',icon_class:'icon-tasks'}]);
+     $.zui.store.set("task_table_btn_12",[{func:'showCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_13",[{func:'showContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_14",[{func:'seeCheckAudit',text:'详情',icon_class:'icon-tasks'},
+                                        {func:'dispatchAppealTaskById',text:'下发',icon_class:'icon-signin'}]);
+    // $.zui.store.set("task_table_btn_14",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_15",[{func:'seeCheckAudit',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_16",[{func:'seeCheckAudit',text:'详情',icon_class:'icon-tasks'}]);
 }
 
 function initAppealList() {
@@ -61,16 +62,17 @@ function queryAppeal(){
         "check_status": cur_status,
     }
     var hide = false;
-    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
+    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA)) {
         hide = true;
     }
     
     var cols = [
             {width: 30, text: '序号', flex: true, colClass: 'text-center',field:'num'},
             {width: 100, text: '任务名称', flex: true,colClass: '',field:'name'},
-            {width: 80, text: '申诉人员',  flex: true, colClass: '',field:'appeal_man_name'},
-            {width: 100, text: '申诉部门',  flex: true, colClass: '',sort: 'down',field:'appeal_dept_name'},
+            {width: 80, text: '申诉人员',  flex: true, colClass: '',field:'checked_person_name'},
+            {width: 100, text: '申诉部门',  flex: true, colClass: '',sort: 'down',field:'checked_dept_name'},
             {width: 80, text: '稽查人员', type: 'string', flex: true, hide:hide,colClass: '',field:'checkman_name'},
+            {width: 80, text: '复核人员', type: 'string', flex: true, hide:hide,colClass: '',field:'recheckman_name'},
             {width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: '',field:'check_period'},
             {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
         ];
@@ -78,7 +80,7 @@ function queryAppeal(){
     colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);
     cols.push(colFunc);
         $('.datatable').mytable({'cols':cols,
-                                'url':"checkAppeal/getList",
+                                'url':"/checkAppeal/getTaskList",
                                 'param':data}
                                 );
     }
@@ -87,12 +89,12 @@ function seeCheckAudit(id,task_id){
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-    post_common_service("/task/getById", {"id":task_id}, function(data){
-            $.checkTask = data;
-            $.checkTask.appeal = rowData;
-            console.log("申诉："+$.checkTask.appeal.id);
-            changePage("/view/mytask/taskDetail.html");
-        });
+    post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
+        $.checkTask = rowData;
+        $.checkTask.appeal = data;
+        console.log("申诉："+$.checkTask.appeal.id);
+        changePage("/view/mytask/taskDetail.html");
+    });
 // }
 }
 //再分配
@@ -141,15 +143,29 @@ function queryUnAssignedTable(){
                                 'param':data}
                                 );
     }
-//查看稽查结果
-function seeCheckAudit1(id,task_id){
-    // alert("task_id:"+task_id+"---id:"+id)
-    // function showTaskDetail1(id){
+//进入稽查页面
+function showCheck(id){
+    // $('#myModal').modal({name:"dd"});
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-    $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
-// }
+    post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
+        $.checkTask = rowData;
+        $.checkTask.appeal = data;
+        console.log("申诉："+$.checkTask.appeal.id);
+        no_return_common_service('/task/update', {"id":id,"check_status":13})
+        changePage("/view/mytask/check.html");
+    });
+}
+//进入继续稽查页面
+function showContinueCheck(id){
+    // $('#myModal').modal({name:"dd"});
+    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
+        $.checkTask = rowData;
+        $.checkTask.appeal = data;
+        changePage("/view/mytask/check.html");
+    });
 }
+
 //再分配
 function distributionAgain(id,task_id){
     alert("task_id:"+task_id+"---id:"+id)
@@ -159,3 +175,25 @@ function distributionAgain(id,task_id){
 function seeDetail(id,task_id){
     alert("task_id:"+task_id+"---id:"+id)
 }
+
+//下发单条任务
+function dispatchAppealTaskById(id){
+    layer.confirm('确定下发任务？', {
+        btn: ['确定','取消'] //按钮
+    }, function(){
+       var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+       var param = {
+            "id": rowData.id,
+            "check_status":15
+        }
+       no_return_common_service('/task/dispatchById', param, function(data){
+            queryAppeal();
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
+        });
+    }, function(index){
+        layer.close(index);
+    });
+    
+}

VisualInspection/js/appeal_management/appeal_submited.js

@@ -0,0 +1,44 @@
+// var page_size=10;
+function querySubmitedAppealTask(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "dept": $("#dept").val(),
+        "status_search_type":2,
+        "check_status":11,
+        "check_status_end":14
+    }
+    var cols = [
+                {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
+                {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},
+                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
+                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
+                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
+                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
+                // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
+                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                    oper:[
+                        {func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}
+                    ]
+                }
+            ];
+    
+    // var pager = {
+    //     page_size:10
+    // }
+    $('#checked_datatable').mytable({'cols':cols,
+                            'url':"/checkAppeal/getTaskList/",
+                            'param':data}
+                            );
+}
+
+function showTaskDetail(id){
+    var rowData=getItemByIdFromArr(id,$('#checked_datatable').mytable('getTableData'));
+    $.checkTask = rowData;
+    post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
+        $.checkTask = rowData;
+        $.checkTask.appeal = data;
+        console.log("申诉："+$.checkTask.appeal.id);
+        changePage("/view/mytask/taskDetail.html");
+    });
+}

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
 // var base_ui_url = "http://10.112.0.236:8088/";
 // var base_server_url = "http://10.112.0.236:8089/";
-var base_image_server_url = "http://10.112.0.236:8088/";
+var base_image_server_url = "http://localhost:8080/";//系统登录会自动重置
 
-var base_ui_url = "http://localhost:8080/";
-var base_server_url = "http://localhost:8089/";
+var base_ui_url = "http://localhost:8081/";//系统登录会自动重置
+var base_server_url = "http://localhost:8089/";//系统登录会自动重置

VisualInspection/js/lib/mytable.js

@@ -154,7 +154,7 @@
                                 dArr.push(obj[cols[i].field]);
                             }
                         }else{ 
-                            dArr.push('0');
+                            dArr.push('');
                         }
                     }
                     

VisualInspection/js/mytask/check.js

@@ -22,6 +22,8 @@ function initCheck() {
     document.dispatchEvent(event);
 
 
+    
+
     // 仅选择日期
     $("#start-time").datetimepicker({
         language: "zh-CN",
@@ -56,6 +58,7 @@ function initCheck() {
         queryScores();
         //查询录像播放列表
         queryVideoList();
+        initBtns();
     }
      $("select#video_list").change(function(){
         playVideo($(this).val());
@@ -65,6 +68,20 @@ function initCheck() {
 function initInfo() {
 
 }
+function initBtns(){
+    if($.checkTask.appeal) {
+        $("#btn_appeal_task").show();
+        $("#btn_task").hide();
+        $("#appeal_div").show();
+        $("#appeal_time").html($.checkTask.appeal.appeal_time);
+        $("#appeal_reason").html($.checkTask.appeal.appeal_reason);
+        $("#appeal_file_list").html(genAppeaFiles($.checkTask.appeal.file_src));
+    }else{
+        $("#appeal_div").hide();
+        $("#btn_appeal_task").hide();
+        $("#btn_task").show();
+    }
+}
 // 使用data参数更新数据：
 function queryScores() {
     //$('#score_datatable').score_datatable("");
@@ -103,6 +120,35 @@ function showEditScore(id) {
     // var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
     showPics(rowData.pics);
     // $("#scoreContent").val(rowData.content);
+    $("#saveEditBtn").show();
+    editScoreId = id;
+}
+var editScoreId;
+function saveEdit(){
+    if(editScoreId) {
+        var imgArr = $("#img_container .pic-class");
+        var picsStr = "";
+        if (imgArr && imgArr.length > 0) {
+            for (var i = 0; i < imgArr.length; i++) {
+                picsStr += imgArr[i].src + ","
+            }
+            picsStr = picsStr.substr(0, picsStr.length - 1);
+        }
+        var param = {
+            'id': editScoreId,
+            'pics': picsStr
+        };       
+        editScoreId = null;
+        $("#saveEditBtn").hide();
+        no_return_common_service("/score/update", param, function (data) {
+            if (scoreLayer) layer.close(scoreLayer);
+            //查询评分情况
+            queryScores();
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
+        });
+    }
 }
 
 function deleteScore(id) {
@@ -129,13 +175,9 @@ function addPic(pic) {
         var i=0;
         var imgArr = $("#img_container .pic-class");
         if(imgArr && imgArr.length>0) i = imgArr.length;
-        var picStr = '<div id="img_item_' + i + '" class="col-md-4 col-sm-6 col-lg-3">'
-            + '<a href="javascript:void(0)" onclick="removeImg(\'#img_item_' + i + '\')" style="float:right;position:absolute;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
-            + '<a class="card lightbox-toggle" href="' + pic + '" style="position:absolute">'
-            + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + pic + '" alt="">'
-            + '</a>'
-            + '</div>';
+        var picStr = genPicstr(pic);
         $('#img_container').append(picStr);
+        $('a.lightbox-toggle').lightbox();
     }
 }
 
@@ -146,12 +188,7 @@ function showPics(pics, divId) {
     if (pics) {
         var picArr = pics.split(',');
         for (var i in picArr) {
-            var pic = '<div id="img_item_' + i + '" class="col-md-4 col-sm-6 col-lg-3">'
-                + '<a href="javascript:void(0)" onclick="removeImg(\'#img_item_' + i + '\')" style="float:right;position:absolute;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
-                + '<a class="card lightbox-toggle" href="' + picArr[i] + '" style="position:absolute">'
-                + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + picArr[i] + '" alt="">'
-                + '</a>'
-                + '</div>';
+            var pic = genPicstr(picArr[i]);
             picStr += pic;
         }
         $(divId).html(picStr);
@@ -159,8 +196,18 @@ function showPics(pics, divId) {
     }
 }
 
-function removeImg(img_id) {
-    $(img_id).remove();
+function genPicstr(src){
+    var pic = '<div class="img_item" style="width:100px;height:90px;float:left;">'
+                + '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
+                + '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">'
+                + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + src + '" alt="">'
+                + '</a>'
+                + '</div>';
+    return pic;
+}
+
+function removeImg(this1) {
+    $(this1).parent('.img_item').remove();
 }
 
 function clearAllImg() {
@@ -173,7 +220,7 @@ function showChangeUser() {
     };
    
     post_common_service("/user/getUserList/", param, function (data) {
-        changePersonLayer = showPopup4Common('更改人员', null, '800px',null,'r');
+        changePersonLayer = showPopup4Common('更改人员', null, ['500px','500px'],null,'r');
         $("#user_container").empty();
         var userStr = "";
         for (var i in data) {
@@ -369,7 +416,7 @@ function submitCheck() {
         "check_status": 4
     }
     no_return_common_service("/task/taskEnd/", param, function (data) {
-        layer.msg(data, {
+        layer.msg("提交成功", {
             time: 2000//20s后自动关闭
         });
         changePage("/view/mytask/unchecked.html");
@@ -386,6 +433,23 @@ function showInvalid() {
     }, ['400px', '500px'], '#invalid_div','r');
 
 }
+function submitCheck4Appeal() {
+    var param = {
+        "id": $.checkTask.id,
+        "check_status": 14
+    }
+    no_return_common_service("/task/taskEnd/", param, function (data) {
+        layer.msg("提交成功", {
+            time: 2000//20s后自动关闭
+        });
+        changePage("/view/mytask/unchecked.html");
+    });
+
+}
+function showPre4Appeal(id) {
+    // $('#myModal').modal({name:"dd"});
+    changePage("/view/mytask/taskDetail.html");
+}
 function saveValidReason() {
     var param = {
         "task_id": $.checkTask.id,

VisualInspection/js/mytask/task_list.js

@@ -84,6 +84,7 @@ function queryTask(){
 function showCheck(id){
     // $('#myModal').modal({name:"dd"});
     $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    $.checkTask.appeal = null;
     no_return_common_service('/task/update', {"id":id,"check_status":3})
     changePage("/view/mytask/check.html");
 }
@@ -91,6 +92,7 @@ function showCheck(id){
 function showContinueCheck(id){
     // $('#myModal').modal({name:"dd"});
     $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    $.checkTask.appeal = null;
     changePage("/view/mytask/check.html");
 }
 //处置无效任务申请
@@ -145,6 +147,7 @@ function refuseApply(taskId){
 function showTaskDetail(id){
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
     $.checkTask = rowData;
+    $.checkTask.appeal = null;
     changePage("/view/mytask/taskDetail.html");
 }
 //下发所有任务

VisualInspection/js/user/login.js

@@ -21,6 +21,11 @@ $(document).ready(function() {
         UserLogin(data, function(data) {
             $btn.button('reset');
             $.zui.store.remove("currentpage");
+
+            //获取域名
+            host = "http://"+window.location.host+"/";
+            base_image_server_url = host;
+            base_ui_url = host;
             window.location.href = base_ui_url + "view/main.html"
 
         }, function(error) {

VisualInspection/js/util/util.js

@@ -290,4 +290,58 @@ function hasRole(role){
         if(roles[i].name==role) return true;
     }
     return false;
+}
+
+function setCheckmanSelect(div,selectId){
+    post_common_service("/user/getAllCheckman",null,function(data){
+        var optStr = '<option value="">全部</option>';
+        for(var i in data) {
+            if(data[i].id==selectId)
+                optStr += '<option value="'+data[i].id+'" selected="selected">'+data[i].truename+'</option>';
+            else
+                optStr += '<option value="'+data[i].id+'">'+data[i].truename+'</option>';
+        }
+        $(div).html('');
+        $(div).html(optStr);
+    });
+}
+function genAppeaFiles(file_src){
+    initStringfunc();
+    var files = $.checkTask.appeal.file_src.split(",");
+    var optionStr="";
+    for(var i in files) {
+        if(files[i].endWith("png") || files[i].endWith("jpg")||files[i].endWith("ico")){
+            optionStr+= '<a href="'+files[i]+'" target="_blank"><img src="'+files[i]+'" style="height:55px;margin:5px;"></a>';
+        }else if(files[i].endWith("doc")|| files[i].endWith("docx")){
+            optionStr+= '<a href="'+files[i]+'" target="_blank"><i class="icon icon-file-word icon-4x" style="vertical-align: middle"></a>';
+        }else if(files[i].endWith("txt")){
+            optionStr+= '<a href="'+files[i]+'" target="_blank"><i class="icon icon-file-code icon-3x"></a>';
+        }
+    }
+    return optionStr;
+}
+function initStringfunc(){
+    String.prototype.endWith = function(str){  
+        if(str==null || str=="" || this.length == 0 ||str.length > this.length){      
+        return false;  
+        }  
+        if(this.substring(this.length - str.length) == str){  
+            return true;  
+        }else{  
+            return false;  
+        }  
+        return true;  
+    };  
+    
+    String.prototype.startWith = function(str){  
+    if(str == null || str== "" || this.length== 0 || str.length > this.length){  
+        return false;  
+    }   
+    if(this.substr(0,str.length) == str){  
+        return true;  
+    }else{  
+        return false;  
+    }         
+    return true;   
+    };  
 }

VisualInspection/view/appeal_management/appealDetail.html

@@ -5,8 +5,7 @@
         <div class="form-group">
             <label class="col-md-2">申诉原因：</label>
             <div class="col-md-10">
-                <!--<input type="text" class="form-control" id="appeal_reason" placeholder="">-->
-                <textarea class="col-md-12" id="appeal_reason" style="height:200px;"></textarea>
+                <textarea class="col-md-12" id="add_appeal_reason" style="height:200px;"></textarea>
             </div>
         </div>
         <div class="form-group">
@@ -28,12 +27,16 @@
     </form>
 </div>
 <script>
+    var file_src="";
     $('#uploaderExample').uploader({
         autoUpload: true,            // 当选择文件后立即自动进行上传操作
-        url: base_server_url +'file/upload',  // 文件上传提交地址
+        url: base_image_server_url +'fileServer/file/upload',  // 文件上传提交地址
         onFileUploaded: function(file, responseObject){
             var datas = eval('('+responseObject.response+')');
-            file_src = datas.result_data.path;
+            file_src += datas.result_data.path+",";
+        },
+        onFilesRemoved:function(files) {
+            // alert(files);
         }
     });
  $(document).ready(function() {
@@ -41,9 +44,14 @@
  });
 
  function saveAppeal(){
+    if(file_src.substr(file_src.length-1,1)==",") file_src = file_src.substr(0,file_src.length-1);
+    if($("#add_appeal_reason").val()=="" || $("#add_appeal_reason").val()==null){
+        layer.alert("原因不能为空！");
+        return;
+    }
     var param = {
         "task_id": $.checkTask.id,
-        "appeal_reason": $("#appeal_reason").val(),
+        "appeal_reason": $("#add_appeal_reason").val(),
         "file_src":file_src
     }
     no_return_common_service("/checkAppeal/add/", param, function (data) {

VisualInspection/view/appeal_management/appeal_checked.html

@@ -0,0 +1,59 @@
+<script src="/js/appeal_management/appeal_checked.js"></script> 
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
+                <div class="col-sm-2">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                </div>
+                <div class="col-sm-2">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fsList">
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary " type="button" onclick="queryUncheckedTask()">查询</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <br>
+
+    <div class="datatable" id="checked_datatable"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        setFeSelect("#fsList");
+        queryCheckedAppealTask();
+    });
+</script>

VisualInspection/view/appeal_management/appeal_submited.html

@@ -0,0 +1,59 @@
+<script src="/js/appeal_management/appeal_submited.js"></script> 
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
+                <div class="col-sm-2">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                </div>
+                <div class="col-sm-2">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fsList">
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary " type="button" onclick="queryUncheckedTask()">查询</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <br>
+
+    <div class="datatable" id="checked_datatable"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        setFeSelect("#fsList");
+        querySubmitedAppealTask();
+    });
+</script>

VisualInspection/view/appeal_management/unassign_appeal1111.html

@@ -0,0 +1,65 @@
+<script src="/js/appeal_management/appeal_list.js?_inline"></script>
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
+                <div class="col-sm-2">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                </div>
+                <div class="col-sm-2">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fsList">
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary " type="button" onclick="queryUnexaminedTask()">查询</button>
+                </div>
+                <div style="float:right;">
+                    <button class="btn btn-success" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-plus-sign"></i> 一键下发</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <br>
+
+    <div id="undispatched_datatable"></div>
+</div>
+<div id="apply_detail_div" style="display:none;text-align:center;">
+    <link rel="import" href="/view/mytask/applyDetail.html?__inline">   
+</div> 
+<script>
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        setFeSelect("#fsList");
+        queryUndispatchedTask();
+    });
+</script>

VisualInspection/view/mytask/check.html

@@ -56,8 +56,8 @@
                         <div class="row" style="padding:0 10px;margin-top:5px;text-align:center">
                             <select class="form-control" id="video_list" style="width:200px;float:left;"></select>
                             <div class="btn-group" style="float:right;">
-                                <button type="button" class="btn btn-info" onclick="setCurrentProcessValue(90)"><i class="icon icon-play-circle icon-2x"></i></button>
-                                <button type="button" class="btn btn-info" onclick="setCurrentProcessValue(70)"><i class="icon icon-pause icon-2x"></i></button>
+                                <button type="button" class="btn btn-info" onclick="doAction('play')"><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></button>
                                 <button type="button" class="btn btn-info" onclick="doAction('slow')"><i class="icon icon-backward icon-2x"></i></button>
                                 <button type="button" class="btn btn-success" onclick="doAction('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
@@ -76,38 +76,56 @@
             <div id="score_datatable" style="height:350px;" data-checkable="true" data-sortable="true"></div>
             <div class="row">
                 <div id="dashboard" class="dashboard dashboard-draggable" data-height="300">
-            <section class="row">
-                <div class="col-md-12">
-                <div class="panel" data-id="1">
-                    <!--<div class="panel-heading">
-                    <i class="icon icon-list"></i>
-                    <span class="title">面板标题</span>
-                    </div>-->
-                    
-                    <div class="panel-body" style="padding:5px;">
-                        <div id="img_container" class="cards cards-borderless col-sm-11">
-                        </div>
-                        <div class="col-sm-1">
-                            <br>
-                            <button class="btn btn-primary" type="button" onclick="clearAllImg()">清空</button>
-                            <br>
-                            <br>
-                            <button class="btn btn-primary" type="button"  onclick="showScore()">评分</button>
-                        </div>
+                <div class="row" id="appeal_div" style="padding:10px;">
+                    <h3>申诉基本信息</h3>
+                    <div>
+                        <table style="width:100%;">
+                            <tr>
+                                <td width="20%">申诉时间：<label id="appeal_time"></label></td>
+                                <td width="20%">申诉原因：<label id="appeal_reason"></label></td>
+                            </tr>
+                            <tr>
+                                <td width="20%">附件：<div class="file-list" id="appeal_file_list"></div></td>
+                            </tr>
+                        </table>
                     </div>
+                </div>
+                <div class="row" class="col-sm-11" style="margin:5px;">
+                    <button class="btn btn-primary" type="button" onclick="clearAllImg()" style="margin-right:10px;">清空</button>
+                    <button class="btn btn-danger" type="button"  onclick="showScore()" style="margin-right:10px;">评分</button>
+                    <button id="saveEditBtn" class="btn btn-warning" type="button"  onclick="saveEdit()" style="margin-right:10px;">保存修改</button>
+                    <form id="form1" runat="server" method="post" enctype="multipart/form-data" style="float:left;margin-right:10px;"> 
+                        <div> 
+                            <button id="box" class="btn btn-primary" type="button">上传</button>
+                            <div style="display:none;"> 
+                            <input type="file" name="_f" id="_f" /> 
+                            </div> 
+                        </div>
+                    </form>                     
+                </div>
+                <div class="panel">
+                    <div class="panel-body" style="padding:5px;" class="col-sm-12">
+                        <div id="img_container" class="cards cards-borderless col-sm-12" style="height:100px;overflow:auto;">
+                        </div>                      
                     </div>
-                </section>
+                </div>
             </div>
                 
             </div>
             <div class="row" style="margin-top:5px;">
-                <div class="col-sm-10">
+                <div class="col-sm-10" id="btn_task">
                     <button class="btn btn-primary" type="button" onclick="submitCheck()">直接提交</button>
                     <button class="btn btn-primary" type="button" onclick="showPre()">预览提交</button>
                     <button class="btn btn-danger" type="button" onclick="showInvalid()">申请无效</button>
                     <!--<button class="btn btn-primary" type="button" data-toggle="modal" data-target="#refuseApplyWin">拒绝申请</button>
                     <button class="btn btn-primary" type="button" onclick="agreeApply()">同意申请</button>-->
                 </div>
+                <div class="col-sm-10" id="btn_appeal_task">
+                    <button class="btn btn-primary" type="button" onclick="submitCheck4Appeal()">直接提交</button>
+                    <button class="btn btn-primary" type="button" onclick="showPre4Appeal()">预览提交</button>
+                    <!--<button class="btn btn-primary" type="button" data-toggle="modal" data-target="#refuseApplyWin">拒绝申请</button>
+                    <button class="btn btn-primary" type="button" onclick="agreeApply()">同意申请</button>-->
+                </div>
             </div>
         </div>
     </div>
@@ -168,5 +186,28 @@
             if(videos[i]) curVideo = videos[i];
             queryVideoList();
         });
+       
+    });
+
+    $("#box").click(function () { 
+        return $("#_f").click(); 
+    }); 
+    $("#_f").change(function() {
+        UpladFile();
     });
+
+    function UpladFile() {
+        var fileObj = document.getElementById("_f").files[0]; // 获取文件对象
+        // var FileController = base_image_server_url +'fileServer/file/upload';// 接收上传文件的后台地址
+        // FormData 对象
+        // var form = new FormData();
+        // form.append("name", "hooyes");                        // 可以增加表单数据
+        // form.append("file", fileObj);                           // 文件对象
+        uploadFile(fileObj, "file", function(data) {
+           
+           addPic(base_image_server_url+data.path);
+        }, function(error) {
+            console.log(error)
+        });
+    }
 </script>

VisualInspection/view/mytask/chooseCheckman.html

@@ -0,0 +1,9 @@
+<div class="container-fluid ">
+    <div class="cards" id="user_container" style="height:200px;overflow:auto;">
+        <label for="exampleInputAccount1" class="col-sm-4">考核部门</label>
+        <div class="col-sm-8">
+            <select class="form-control" id="choseCheckmanList">
+            </select>
+        </div>
+    </div>
+</div>

VisualInspection/view/mytask/taskDetail.html

@@ -37,16 +37,23 @@
                     <td width="20%">申诉原因：<label id="appeal_reason"></label></td>
                 </tr>
                 <tr>
-                    <td width="20%">附件：<label id="files"></label></td>
+                    <td width="20%">附件：
+                        <div class="file-list" id="appeal_file_list">
+                         </div>
+                    </td>
+                    <td>
+                    </td>
                 </tr>
             </table>
         </div>
       </div>
     <div class="row" style="margin-top:5px;text-align:center">
         <div>
-            <button id="submitBtn" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
-            <button id="confirmBtn" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
-            <button id="appealBtn" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
+            <button id="submitBtn" style="display:none" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
+            <button id="confirmBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
+            <button id="confirmAppealBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck4Appeal()">申诉结果确认</button>
+            <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>
         </div>
     </div>
 </div>
@@ -58,6 +65,9 @@
 </div>
 <div id="appealDetail-div" style="display:none;text-align:center;">
     <link rel="import" href="/view/appeal_management/appealDetail.html?__inline">   
+</div>
+<div id="chooseCheckman-div" style="display:none;text-align:center;">
+    <link rel="import" href="/view/mytask/chooseCheckman.html?__inline">   
 </div> 
 <style>
     .line{
@@ -92,8 +102,10 @@
 
         if($.checkTask.appeal) {
             $("#appeal_div").show();
-            $("#appeal_time").html($.checkTask.appeal_time);
-            $("#appeal_reason").html($.checkTask.appeal_reason);
+            $("#appeal_time").html($.checkTask.appeal.appeal_time);
+            $("#appeal_reason").html($.checkTask.appeal.appeal_reason);
+            
+            $("#appeal_file_list").html(genAppeaFiles($.checkTask.appeal.file_src));
         }else{
             $("#appeal_div").hide();
         }
@@ -103,20 +115,48 @@
        
         $('a.lightbox-toggle').lightbox();
     });
-
+    
+    //初始化表行按钮
+    function initBtns() {
+        $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_3",["#submitBtn"]);
+        $.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"]);
+    }
     function checkAuth(){
-        if(hasRole(ROLE_JICHA)) {
-            $("#submitBtn").show();
-        }else{
-            $("#submitBtn").hide();
-        }
-        
-        if(hasRole(ROLE_STATION_ADMIN) && $.checkTask.check_status==5) {
-            $("#confirmBtn").show();
-            $("#appealBtn").show();
-        }else{
-            $("#appealBtn").hide();
-            $("#confirmBtn").hide();
+        initBtns();
+        showBtn(ROLE_JICHA,$.checkTask.check_status);
+        showBtn(ROLE_JICHA_ADMIN,$.checkTask.check_status);
+        showBtn(ROLE_STATION_ADMIN,$.checkTask.check_status);
+
+        // if(hasRole(ROLE_JICHA_ADMIN && $.checkTask.check_status==11)) {
+        //     $("#assignBtn").show();
+        // }else{
+        //     $("#assignBtn").hide();
+        // }
+
+        // if(hasRole(ROLE_STATION_ADMIN) && $.checkTask.check_status==5) {
+        //     $("#confirmBtn").show();
+        //     $("#appealBtn").show();
+        // }else{
+        //     $("#appealBtn").hide();
+        //     $("#confirmBtn").hide();
+        // }
+
+        // if(hasRole(ROLE_STATION_ADMIN) && $.checkTask.check_status==15) {
+        //     $("#confirmAppealBtn").show();
+        // }else{
+        //     $("#confirmAppealBtn").hide();
+        // }
+    }
+    function showBtn(role, status) {
+        if(hasRole(role)) {
+             var btnArr = $.zui.store.get("task_detail_btn_"+role+"_"+status);
+             if(btnArr) {
+                 for(var i in btnArr) {
+                     $(btnArr[i]).show();
+                 }
+             }
         }
     }
     function queryScores(){
@@ -233,8 +273,24 @@
         
     }
 
+    var appealLayer;
     function showAppeal(){
-        appealLayer = showPopup4Common('申诉',saveAppeal,'600px','#appealDetail-div');
+        // appealLayer = showPopup4Common('申诉',saveAppeal,'600px','#appealDetail-div');
+        layer.open({
+            type: 1,
+            area: '600px',
+            title: '申诉',
+            closeBtn: 1,
+            shadeClose: true,
+            skin: 'layui-layer-lan',
+            content: $('#appealDetail-div'),
+            btn: '保存',
+            btnAlign: 'c', //按钮居中
+            shade: 0 ,//不显示遮罩
+            yes: function(index){
+                saveAppeal();
+            }
+        });
     }
 
     function confirmCheck(){
@@ -249,4 +305,38 @@
             changePage("/view/mytask/task_list.html?status=5");
         });
     }
+
+    function confirmCheck4Appeal(){
+        var param = {
+            "id": $.checkTask.id,
+            "check_status":16
+        }
+        no_return_common_service("/task/update/",param,function(data){
+             layer.msg("确认成功", {
+                time: 2000//20s后自动关闭
+             });
+            changePage("/view/mytask/task_list.html?status=5");
+        });
+    }
+
+    function showAssign(){
+        showPopup4Common('分配稽查员',function(){
+            saveAssign();
+        },'400px','#chooseCheckman-div');
+        setCheckmanSelect('#choseCheckmanList');
+    }
+
+    function saveAssign(){
+         var param = {
+            "id": $.checkTask.id,
+            "recheckman": $('#choseCheckmanList').val(),
+            "check_status":12
+        }
+        no_return_common_service("/task/update/",param,function(data){
+             layer.msg("分配成功", {
+                time: 2000//20s后自动关闭
+             });
+            changePage("/view/mytask/task_list.html?status=11");
+        });
+    }
     </script>