视频稽查页面逻辑

VisualInspection/js/lib/mytable.js

@@ -100,6 +100,19 @@
                 for(var i=0;i<cols.length;i++){
                     if(cols[i].func!=null){
                         dArr.push(cols[i].func(obj[cols[i].field]));
+                    }else if(cols[i].type=="imagedd"){
+                        var pics = obj[cols[i].field];
+                        var picStr='';
+                        if(pics){
+                            var picArr = pics.split(',');
+                            for(var j in picArr){
+                                var pic =  '<a class="card lightbox-toggle" href="'+picArr[j]+'">'
+                                    +      '<img class="pic-class" style="height:50px;" src="'+picArr[j]+'" alt="">'
+                                    +  '</a>';
+                                picStr+=pic;
+                            }
+                        }
+                        dArr.push(picStr);
                     }else if(cols[i].oper!=null) {
                         var oper = cols[i].oper;
                         var operStr="";
@@ -114,10 +127,11 @@
                             }else{
                                 dArr.push(timeStamp2String(obj[cols[i].field],cols[i].date_type));
                             }
-                        }else if(obj[cols[i].field])
+                        }else if(obj[cols[i].field]){
                             dArr.push(obj[cols[i].field]);
-                        else 
+                        }else {
                             dArr.push('');
+                        }
                     }
                     
                 }

VisualInspection/js/mytask/check.js

@@ -28,97 +28,291 @@ function initCheck(){
             setFeSelect("#fsList",$.checkTask.deptid);
             setLaneSelect("#lane",$.checkTask.checked_location);
             get_common_service('user/getUserById/'+$.checkTask.checked_person, null, function(data){
-                $("#checked_person").html(data.truename);
+               changePersonContent(data);
             }) 
             //查询评分情况
             queryScores();
         }
 }
-    // 使用data参数更新数据：
-    function queryScores(){
-        var data = {
-            "task_id": $.checkTask.id
-        }
-        var cols = [
-                    {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
-                    {width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down',field: 'content'},
-                    {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
-                    {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                        oper:[
-                            {func:'showEditScore',text:'修改',icon_class:'icon-edit'},
-                            {func:'deleteScore',text:'删除',icon_class:'icon-remove-circle'}
-                        ]
-                    }
-                ];
-        
-        // var pager = {
-        //     page_size:10
-        // }
-        $('.datatable').mytable({'cols':cols,
-                                'url':"/score/getScoreList/",
-                                'param':data}
-                                );
-    }
-    function showEditScore(id){
-        // deleteItem4Common(id,"/score/delete/",queryScores);
-        var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-        showPics(rowData.pics);
-    }
 
-    function deleteScore(id){
-        deleteItem4Common(id,"/score/delete/",queryScores);
+function initInfo(){
+
+}
+// 使用data参数更新数据：
+function queryScores(){
+    var data = {
+        "task_id": $.checkTask.id
     }
+    var cols = [
+                {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
+                {width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down',field: 'content'},
+                {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
+                // {width: 80, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
+                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                    oper:[
+                        {func:'showEditScore',text:'修改',icon_class:'icon-edit'},
+                        {func:'deleteScore',text:'删除',icon_class:'icon-remove-circle'}
+                    ]
+                }
+            ];
+    
+    // var pager = {
+    //     page_size:10
+    // }
+    $('#score_datatable').mytable({'cols':cols,
+                            'url':"/score/getScoreList/",
+                            'param':data}
+                            );
+}
+function showEditScore(id){
+    // deleteItem4Common(id,"/score/delete/",queryScores);
+    var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
+    // scoreDetailLayer = showPopup4Common('修改考核项',null,['600px','500px'],'#score-detail-div');
+    // var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
+    showPics(rowData.pics);
+    // $("#scoreContent").val(rowData.content);
+}
 
-    function showPics(pics){
-        var picStr='';
-        $('#img_container').html(picStr);
-        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 src="'+picArr[i]+'" alt="">'
-                    +  '</a>'
-                    +'</div>';
-                picStr+=pic;
-            }
-            $('#img_container').html(picStr);
-            $('a.lightbox-toggle').lightbox();
+function deleteScore(id){
+    deleteItem4Common(id,"/score/delete/",queryScores);
+}
+
+function showPics(pics,divId){
+    var picStr='';
+    if(!divId) divId = '#img_container';
+    $(divId).html(picStr);
+    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>';
+            picStr+=pic;
         }
+        $(divId).html(picStr);
+        $('a.lightbox-toggle').lightbox();
     }
+}
 
-    function removeImg(img_id){
-        $(img_id).remove();
-    }
+function removeImg(img_id){
+    $(img_id).remove();
+}
 
-    function clearAllImg(){
-        $('#img_container').empty();
-    }
-    function showPre(id){
-        // $('#myModal').modal({name:"dd"});
-        changePage("/view/mytask/taskDetail.html");
-    }
+function clearAllImg(){
+    $('#img_container').empty();
+}
+var changePersonLayer;
+function showChangeUser(){
+    var param ={
+        'organid':$.checkTask.dept_id
+    };
+    post_common_service("/user/getUserList/",param,function(data){
+        changePersonLayer = showPopup4Common('更改人员',null,'800px');
+        $("#user_container").empty();
+        var userStr="";
+        for(var i in data){
+            var name = data[i].truename;
+            if(data[i].workno) name=data[i].workno+" "+name;
+            var pic = "../../images/body-bg.png";
+            if(data[i].pic) pic=data[i].pic;
+            str='<div style="width:100px;float:left;margin:5px;">'
+                    +'<a class="card" href="javascript:void(0)" onclick="changePerson(\''+data[i].id+'\')">'
+                    +   '<img src="'+pic+'" alt="" style="height:100px">'
+                    // +   '<a href="#" onclick="changePerson(\''+name+'\')">'+name+'<a href="'+data[i].pic+'class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a></a>'
+                    +  '<div class="card-heading"><strong>'+name+'</strong></div>'
+                    +'</a>'
+                +'</div>';
+            userStr+=str;
+        }
+        $("#user_container").html(userStr);
+    })
+}
 
-    function saveValidReason(){
-        alert("提交成功！");
-        $('#validSubmitWin').modal('toggle');
-    }
-    function changePerson(id){
-        $('#checkedPerson').html(id);
-        $('#changePersonWin').modal('toggle');
-    }
+function changePerson(id){
+    // $('#checked_person').html(id);
+    get_common_service('user/getUserById/'+id, null, function(data){
+        changePersonContent(data);
+    }) 
+    layer.close(changePersonLayer);
+}
 
-    function score(score){
-        alert("扣分："+score);
-        $('#scoreWin').modal('toggle');
-    }
+function changePersonContent(data){
+    var name = data.truename;
+    if(data.workno) name=data.workno+" "+data.truename;
+    $("#checked_person").html(name);
+    $("#person_img").attr("href",data.pic);
+    $("#person_img > img").attr("src",data.pic);
+    $('a.lightbox-toggle').lightbox();
+}
+var scoreLayer;
+function showScore(){
+    scoreLayer = showPopup4Common('选择考核项',null,['400px','500px'],'#items-div');
+    buildTree();
+}
+function buildTree(){
+     var zTreeObj;
+     var zNodes = [];
+     check_item_tree = $.fn.zTree.init($("#items_tree"), {}, zNodes);
+
+     getCheckItems();
+}
+function getCheckItems(){
+    function zTreeOnRename(event, treeId, treeNode, isCancel) {
+         alert(treeNode.tId + ", " + treeNode.name);
+     }
 
-    function refuseApply(){
-        alert("拒绝申请");
-        $('#refuseApplyWin').modal('toggle');
+     function zTreeOnRemove(event, treeId, treeNode) {
+         alert(treeNode.tId + ", " + treeNode.name);
+     }
+
+
+     var setting = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: false, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         },
+         callback: {
+             onDblClick: zTreeOnClick
+         },
+         edit: {
+             enable: true,
+             drag: {
+                 autoExpandTrigger: true,
+                 isMove: true,
+                 prev: false,
+                 next: true,
+                 inner: true,
+                 autoOpenTime: 0
+             },
+             showRenameBtn: false,
+             showRemoveBtn: false
+         }
+     };
+
+     get_common_service('checkItem/getAll',null,function(data) {
+         zdata = [];
+         for (var i = 0; i < data.length; i++) {
+             var m = data[i];
+            //  var zdataItem = {};
+            //  zdataItem["id"] = m.id;
+            //  zdataItem["value"] = m.id;
+            //  zdataItem["pId"] = null;
+            //  zdataItem["score"] = m.score ;
+            //  zdataItem["name"] = m.name;
+            //  zdataItem["open"] = true;
+            //  zdataItem["children"] = addobj(m);
+             zdata.push(genNode(m));
+         }
+         menu_tree = $.fn.zTree.init($("#items_tree"), setting, zdata)
+     }, function(error) {
+
+     });
+}
+function addobj(data) {
+     var zdata = [];
+     if (typeof(data.subCheckItem) != "undefinde" && data.subCheckItem != null &&
+         data.subCheckItem.length > 0) {
+         for (var i = 0; i < data.subCheckItem.length; i++) {
+             var m = data.subCheckItem[i];
+            //  var zdataItem = {};
+            //  zdataItem["id"] = m.id;
+            //  zdataItem["value"] = m.id;
+            //  zdataItem["pId"] = data.id;
+            //  zdataItem["score"] = m.score ;
+            //  zdataItem["icon"] = "";
+            //  zdataItem["name"] = m.name;
+            //  if(m.score)
+            //     zdataItem["name"] = m.name+'('+m.score+')';
+            //  zdataItem["open"] = true;
+            //  zdataItem["children"] = addobj(m);
+             zdata.push(genNode(m));
+         }
+         return zdata;
+     } else {
+         return [];
+     }
+ }
+ function genNode(m){
+        var zdataItem = {};
+        zdataItem["id"] = m.id;
+        zdataItem["value"] = m.name;
+        zdataItem["pId"] = m.parent_id;
+        zdataItem["score"] = m.score ;
+        zdataItem["icon"] = "";
+        zdataItem["name"] = m.name;
+        //zdataItem["content"] = m.name;
+        if(m.score) zdataItem["name"] = m.name+'('+m.score+')';
+        zdataItem["open"] = true;
+        zdataItem["children"] = addobj(m);    
+        return   zdataItem;
+ }
+ 
+ function zTreeOnClick(event, treeId, treeNode) {
+    //alert(treeNode.name);
+    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 = {
+        'task_id':$.checkTask.id,
+        'pics':picsStr,
+        'name':treeNode.value,
+        'content':treeNode.value,
+        'check_item_id':treeNode.id,
+        'checkman':treeNode.id,
+        'checked_person':$.checkTask.checked_person,
+        'checked_dept':$.checkTask.checked_dept
+    };
+    no_return_common_service("/score/add",param, function(data){
+        if(scoreLayer) layer.close(scoreLayer);
+        //查询评分情况
+        queryScores();
+        layer.msg(data, {
+            time: 2000//20s后自动关闭
+        });
+    });
+ }
+function showPre(id){
+    // $('#myModal').modal({name:"dd"});
+    changePage("/view/mytask/taskDetail.html");
+}
+
+function saveValidReason(){
+    alert("提交成功！");
+    $('#validSubmitWin').modal('toggle');
+}
+
+
+function score(score){
+    alert("扣分："+score);
+    $('#scoreWin').modal('toggle');
+}
+
+function refuseApply(){
+    alert("拒绝申请");
+    $('#refuseApplyWin').modal('toggle');
+}
 
-    function agreeApply(){
-        alert("同意申请");
-    }
+function agreeApply(){
+    alert("同意申请");
+}

VisualInspection/js/util/service.js

@@ -163,7 +163,9 @@ function no_return_common_service(url, param, success, fail) {
         if (data.result_code == 0) {
             success(data.result_desc)
         } else {
-            fail(data.result_desc);
+            layer.msg(data.result_desc, {
+                time: 2000//20s后自动关闭
+            });
         }
     }, function(error) {
         fail("网络错误");

VisualInspection/js/util/util.js

@@ -109,17 +109,18 @@ function getItemByIdFromArr(id,curDatas){
     return rowData;
 }
 
-function showPopup4Common(title,callback,area){
+function showPopup4Common(title,callback,area,divId){
     if(!area) area='auto';
+    if(!divId) divId='#form-div';
     //添加常量页面
-    layer.open({
+    return layer.open({
         type: 1,
         area: area,
         title: title,
         closeBtn: 1,
         shadeClose: true,
         skin: 'layui-layer-lan',
-        content: $('#form-div'),
+        content: $(divId),
         btn: '保存',
         btnAlign: 'c', //按钮居中
         shade: 0 ,//不显示遮罩
@@ -151,7 +152,7 @@ function deleteItem4Common(id,url,okCb){
 
 function addOrUpdateItem4Common(param,url,okCb){
     no_return_common_service(url, param, function(data) {
-        okCb();//重新加载表格数据
+        if(okCb) okCb();//重新加载表格数据
         layer.msg(data, {
             time: 2000//20s后自动关闭
         });

VisualInspection/view/mytask/changePerson.html

@@ -1,54 +1,22 @@
 <div class="container-fluid ">
-        <form class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount4" class="col-sm-2">字典标识</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="flag_name" placeholder="字典标识">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">标识名称</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="标识名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">字典值</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="字典值">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">字典名称</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="字典名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">排序号</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="排序号">
-                </div>
-            </div>
-             <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">备注</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="标识名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                <div class="checkbox">
-                    <label>
-                    <input type="checkbox">有效
-                    </label>
-                </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                <button type="submit" class="btn btn-default">保存</button>
-                </div>
-            </div>
-            </form>
-    </div>
+        <div class="cards" id="user_container">
+             <div style="width:200px;">
+                <a class="card" href="###">
+                    <img src="../../image/img4.jpg" alt="">
+                    <div class="card-heading"><strong>011 潘虎</strong></div>
+                    <div class="card-actions">
+                        <button type="button" class="btn btn-danger"><i class="icon-heart"></i> 更换</button>
+                    </div>
+                </a>
+             </div>
+            <div style="width:200px;">
+                <a class="card" href="###">
+                    <img src="../../image/img4.jpg" alt="">
+                    <div class="card-heading"><strong>022 飞机垃圾费</strong></div>
+                    <div class="card-actions">
+                        <button type="button" class="btn btn-danger"><i class="icon-heart"></i> 更换</button>
+                    </div>
+                </a>
+            </div>
+        </div>
+</div>

VisualInspection/view/mytask/check.html

@@ -4,25 +4,22 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">收费站</label>
                 <div class="col-sm-2">
-                    <select class="form-control"  id="fsList">
-                            <option value="">全部</option>
-                            <option value="1">东台收费站</option>
-                            <option value="2">收费站</option>
-                            <option value="3">收费站</option>
-                        </select>
+                    <select class="form-control"  id="fsList" disabled="disabled">
+                        
+                    </select>
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">车道号</label>
                 <div class="col-sm-2">
-                    <select class="form-control" id="lane"></select>
+                    <select class="form-control" id="lane" disabled="disabled"></select>
                 </div>
                 <label class="col-sm-1">考核人员</label>
                 <div class="col-sm-2">
                     <!-- 使用图片 -->
-                    <a href="../../images/img4.jpg" class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a>
-                    <label id="checked_person">0518 盛兴峰</label>
+                    <a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle"><img src="../../images/img4.jpg" alt="" style="width:50px;height:50px;"></a>
+                    <label id="checked_person"></label>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" data-toggle="modal" data-target="#changePersonWin">更改考核人员</button>
+                    <button class="btn btn-primary " type="button" onclick="showChangeUser()">更改考核人员</button>
                 </div>
             </div>
         </form>
@@ -30,89 +27,80 @@
 
     <div class="row">
         <div class="col-sm-6">
-            <ul class="nav nav-secondary">
-                <li class="active"><a data-tab href="#tabContent1">收费亭</a></li>
-                <li><a data-tab href="#tabContent2">车道</a></li>
-                <li><a data-tab href="#tabContent3">广场</a></li>
-            </ul>
-            <div class="tab-content">
-                <div class="tab-pane active" id="tabContent1">
-                    <img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图" alt="" width="500">
-                </div>
-                <div class="tab-pane" id="tabContent2">
-                    <img data-toggle="lightbox" src="../../images/bg.jpg" data-caption="小图看大图" alt="" width="500">
-                </div>
-                <div class="tab-pane" id="tabContent3">
-                    <img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图" alt="" width="500">
-                </div>
-            </div>
-            <div class="row">
-                <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" data-toggle="modal" data-target="#scoreWin">评分</button>
-                </div>
+            <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">
+                        <ul class="nav nav-secondary">
+                            <li class="active"><a data-tab href="#tabContent1">收费亭</a></li>
+                            <li><a data-tab href="#tabContent2">车道</a></li>
+                            <li><a data-tab href="#tabContent3">广场</a></li>
+                        </ul>
+                        <div class="tab-content" style="height:330px;">
+                            <div class="tab-pane active" id="tabContent1" class="col-sm-12">
+                            </div>
+                            <div class="tab-pane" id="tabContent2" class="col-sm-12">
+                            </div>
+                            <div class="tab-pane" id="tabContent3" class="col-sm-12">
+                            </div>
+                        </div>
+                        <div class="row" style="margin-top:5px;text-align:center">
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-info">播放</button>
+                                <button type="button" class="btn btn-primary">停止</button>
+                                <button type="button" class="btn btn-warning">快进</button>
+                                <button type="button" class="btn btn-danger">快退</button>
+                                <button type="button" class="btn btn-success">抓图</button>
+                            </div>
+                        </div>
+                        <hr>
+                        <div class="row">
+                            <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>
+                        </div>
+                    </div>
+                    </div>
+                </section>
             </div>
+            
         </div>
         <div class="col-sm-6">
-            <div class="datatable" data-checkable="true" data-sortable="true"></div>
-            <div class="col-sm-2">
-                <button class="btn btn-primary" type="button" onclick="submitResult()">直接提交</button>
-            </div>
-            <div class="col-sm-2">
-                <button class="btn btn-primary" type="button" onclick="showPre()">预览提交</button>
-            </div>
-            <div class="col-sm-2">
-                <button class="btn btn-danger" type="button" data-toggle="modal" data-target="#validSubmitWin">申请无效</button>
-            </div>
-            <div class="col-sm-2">
-                <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#refuseApplyWin">拒绝申请</button>
-            </div>
-            <div class="col-sm-2">
-                <button class="btn btn-primary" type="button" onclick="agreeApply()">同意申请</button>
+            <div id="score_datatable" style="height:490px;" data-checkable="true" data-sortable="true"></div>
+            <div class="row" style="margin-top:5px;">
+                <div class="col-sm-10">
+                    <button class="btn btn-primary" type="button" onclick="submitResult()">直接提交</button>
+                    <button class="btn btn-primary" type="button" onclick="showPre()">预览提交</button>
+                    <button class="btn btn-danger" type="button" data-toggle="modal" data-target="#validSubmitWin">申请无效</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>
 </div>
-<!-- 对话框HTML -->
-<div class="modal fade" id="myModal">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                <h4 class="modal-title">添加常量</h4>
-            </div>
-            <div class="modal-body">
-                <link rel="import" href="/view/constant/form.html?__inline">
-            </div>
-        </div>
-    </div>
+<div id="form-div" style="display:none;text-align:center;">
+    <link rel="import" href="/view/mytask/changePerson.html?__inline">   
+</div> 
+<div id="items-div" style="display:none;text-align:center;">
+   <ul id="items_tree" class="ztree"></ul>  
 </div>
-<!-- 对话框HTML -->
-<div class="modal fade" id="changePersonWin">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                <h4 class="modal-title">更改用户</h4>
-            </div>
-            <div class="modal-body">
-                <ul class="tree" data-ride="tree">
-                    <li>
-                        <a href="#" onclick="changePerson('001 张三')">001 张三 <a href="../../images/img4.jpg" class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a></a>
-                    </li>
-                    <li><a href="#" onclick="changePerson('002 李四')">002 李四 <a href="../../images/img4.jpg" class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a></a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-
+<div id="score-detail-div" style="display:none;text-align:center;">
+  <link rel="import" href="/view/mytask/scoreDetail.html?__inline"> 
+</div> 
 <!-- 对话框HTML -->
 <div class="modal fade" id="validSubmitWin">
     <div class="modal-dialog">
@@ -157,25 +145,7 @@
         </div>
     </div>
 </div>
-<!-- 对话框HTML -->
-<div class="modal fade" id="scoreWin">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                <h4 class="modal-title">评分</h4>
-            </div>
-            <div class="modal-body">
-                <ul class="tree" data-ride="tree">
-                    <li>
-                        <a href="#" onclick="score('10')">仪容仪表</a>
-                    </li>
-                    <li><a href="#" onclick="score('20')">礼貌用语</li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
+
 <script>
     $(document).ready(function() {
         initCheck();

VisualInspection/view/mytask/scoreDetail.html

@@ -0,0 +1,19 @@
+<div class="container-fluid ">
+    <div class="cards">
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">内容</label>
+            <div class="col-md-6 col-sm-10">
+                    <input type="text" class="form-control" id="content" placeholder="">
+            </div>
+        </div>
+        <div id="img_edit_container" class="cards cards-borderless col-sm-11">
+        </div>
+    </div>
+    <div>
+        <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>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/User.java

@@ -43,7 +43,7 @@ public class User implements UserDetails {
 	// 座机号是否为外地 0：不是 1：是
 	private String phoneadderss;
 	// 工号
-	private String worknumber;
+//	private String worknumber;
 	// 工号+密码组合后的值
 	private String workidpassword;
 	// 是否内部人员(1-是 2-否)

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -5,6 +5,8 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="username" property="username" jdbcType="VARCHAR" />
         <result column="password" property="password" jdbcType="VARCHAR" />
+        <result column="organid" property="organid" jdbcType="INTEGER" />
+        <result column="workno" property="workno" jdbcType="VARCHAR" />
     </resultMap>
     <resultMap id="userMap" type="com.xintong.visualinspection.bean.User">
         <id property="id" column="ID"/>

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/ScoreMapper.xml

@@ -50,7 +50,7 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Score" >
         INSERT INTO
         check_score
-        (task_id,update_time,pics,videos,check_item_id,content,checkman,checked_person,checked_dept,emark)
+        (task_id,update_time,pics,videos,check_item_id,content,checkman,checked_person,checked_dept,remark)
         VALUES
         (#{task_id}, #{update_time},#{pics},#{videos},#{check_item_id},#{content},#{checkman},#{checked_person},#{checked_dept},#{remark})
     </insert>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/ScoreServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.slf4j.LoggerFactory;
@@ -51,6 +52,7 @@ public class ScoreServiceImpl extends BaseService implements ScoreService {
 	@Override
 	public void insert(Score score) {
 		// TODO Auto-generated method stub
+		score.setUpdate_time(new Date());
 		scoreDao.insert(score);
 	}