Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/assess_management/assess_item.js

@@ -0,0 +1,61 @@
+$(document).ready(function() {
+
+    // 使用data参数更新数据：
+    $('.datatable').datatable( {
+        checkable:false,
+        sortable:false,
+        data: {
+            cols: [
+                {width: 30, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
+                {width: 160, text: '考核办法', type: 'date', flex: false, sort: 'down'},
+                {width: 80, text: '被考核部门', type: 'string', flex: true, colClass: ''},
+                {width: 80, text: '被考核职位', type: 'date', flex: false, sort: 'down'},
+                {width: 80, text: '被考核人员', type: 'string', flex: true, colClass: ''},
+                {width: 80, text: '考核项', type: 'date', flex: false, sort: 'down'},
+                {width: 80, text: '操作', type: 'string', flex: true, colClass: ''},
+            ],
+            rows: [
+                {checked: false, data: [1, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">92项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                {checked: false, data: [2, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                {checked: false, data: [3, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                {checked: false, data: [4, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                {checked: false, data: [5, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                {checked: false, data: [6, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                {checked: false, data: [7, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                {checked: false, data: [8, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+            ]
+        }
+    });
+
+    // data tree
+    var myTreeData = [{
+        title: '<div>坚果</div>',
+    },
+        {
+        title: '水果',
+        open: true,
+        children: [
+            {title: '橘子'},
+            {
+                title: '瓜',
+                children: [
+                {title: '西瓜'},
+                {title: '黄瓜'}
+                ]
+            }
+        ]
+    }, {
+        title: '坚果',
+         open: true,
+        children: [
+            {title: '向日葵'},
+            {title: '瓜子'}
+        ]
+    }, {
+        title: '蔬菜',
+         open: true,
+    }];
+
+    $('#myTree').tree({data: myTreeData});
+
+});

VisualInspection/js/assess_management/assess_way.js

@@ -0,0 +1,31 @@
+
+$(document).ready(function() {
+
+    // 使用data参数更新数据：
+        $('.datatable').datatable( {
+            checkable:false,
+            sortable:false,
+            data: {
+                cols: [
+                    {width: 30, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
+                    {width: 160, text: '考核办法', type: 'date', flex: false, sort: 'down'},
+                    {width: 80, text: '被考核部门', type: 'string', flex: true, colClass: ''},
+                    {width: 80, text: '被考核职位', type: 'date', flex: false, sort: 'down'},
+                    {width: 80, text: '被考核人员', type: 'string', flex: true, colClass: ''},
+                    {width: 80, text: '考核项', type: 'date', flex: false, sort: 'down'},
+                    {width: 80, text: '操作', type: 'string', flex: true, colClass: ''},
+                ],
+                rows: [
+                    {checked: false, data: [1, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">92项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [2, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [3, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [4, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [5, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [6, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [7, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [8, '收费站收费员视频考核管理办法','收费站','收费员','所有收费员','<a href="#">82项</a>','<a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                ]
+            }
+        });
+
+});

VisualInspection/view/assess_management/assess_item.html

@@ -12,41 +12,75 @@
 <body>
     <link rel="import" href="/view/common/head.html?__inline">
 
-
-
-
-    <div id="main" class="container-fluid main">
-        <div class="row">
-            <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                <div id="mum_left" class="mum_left">
-                    <link rel="import" href="/view/mum.html?__inline">
+        <!--考核项 s-->
+        <div id="main" class="container-fluid main">
+            <div class="row">
+                <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
+                    <div id="mum_left" class="mum_left">
+                        <link rel="import" href="/view/mum.html?__inline">
+                    </div>
                 </div>
-            </div>
-            <div class="col-md-10">
-                <div id="mum_right" class="mum_right">
+                <div class="col-md-10">
+                    <div id="mum_right" class="mum_right">
 
-                    <div class="panel">
-                        <div class="panel-heading">
-                            <ol class="breadcrumb" style="margin-bottom: 0;">
-                                <li><a href="your/url/">视频稽查</a></li>
-                                <li><a href="your/url/">已稽查</a></li>
-                                <li class="active">稽查详情</li>
-                            </ol>
-                        </div>
-                        <div class="panel-body" id="main_content">
-                            <link rel="import" href="/view/constant/constant.html?__inline">
+                        <div class="panel">
+                            <div class="panel-heading">
+                                <ol class="breadcrumb" style="margin-bottom: 0;">
+                                    <li><a href="your/url/">考核办法管理</a></li>
+                                    <li class="active">考核项</li>
+                                </ol>
+                            </div>
+                            <div class="panel-body" id="main_content">
+                                <!-- 考核办法 start -->
+                                <div class="container-fluid ">
+                                        <div class="row">
+                                            <div class="col-xs-3">
+                                                <div class="input-group">
+                                                    <span class="input-group-addon">关键词</span>
+                                                    <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
+                                                </div>
+                                            </div>
+                                            
+                                            <div class="col-xs-3">
+                                                <div class="input-group">
+                                                    <button class="btn btn-primary " type="button">查询</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <hr>
+                                        <div class="row">
+                                            <div class="col-sm-12" style="text-align:center;">
+                                                <span style="font-size:18px;">收费站收费员视频考核管理办法</span>
+                                            </div>
+                                        </div>
+                                        <hr>
+                                        <div class="row">
+                                            <div class="col-sm-offset-3 col-sm-3">
+                                                 <ul class="tree tree-lines" id="myTree">
+                                                    ...
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-sm-1 col-sm-offset-5">
+                                                <button type="submit" class="btn btn-info">保存</button>
+                                            </div>
+                                            <div class="col-sm-1">
+                                                <button type="submit" class="btn btn-info">取消</button>
+                                            </div>
+                                        </div>
+                                </div>
+                                <!-- 考核办法  end -->          
+                            </div>
                         </div>
                     </div>
-
                 </div>
-
             </div>
-
         </div>
-    </div>
+        <!--考核项 e-->
 
     <link rel="import" href="/view/common/foot.html?__inline">
-    <script src="/js/main.js"></script>
+    <script src="/js/assess_management/assess_item.js"></script>
 </body>
 
 

VisualInspection/view/assess_management/assess_way.html

@@ -59,7 +59,7 @@
 
                                         <div class="row">
                                             <!-- 使用一个div来显示数据表格 -->
-                                            <div class="datatable" data-checkable="true" data-sortable="true"></div 
+                                            <div class="datatable" data-checkable="true" data-sortable="true"></div>
                                         </div>
                                         <div class="row" style="text-align:center">
                                             <ul class="pager center-block">
@@ -82,10 +82,40 @@
                                             <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>
+                                            <h4 class="modal-title">添加考核办法</h4>
                                         </div>
                                         <div class="modal-body">
-                                            <link rel="import" href="/view/constant/add.html?__inline">
+                                               <!-- 添加对话框 -->
+                                                <div class="container-fluid ">
+                                                    <form class="form-horizontal">
+                                                        <div class="form-group">
+                                                            <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">考核办法</label>
+                                                            <div class="col-md-6 col-sm-8">
+                                                            <input type="text" class="form-control" id="flag_name" placeholder="考核办法">
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label for="exampleInputPassword4" class="col-sm-offset-1 col-sm-2">考核对象</label>
+                                                            <div class="col-md-3 col-sm-4">
+                                                                <select type="text" class="form-control" >
+                                                                    <option>请选择</option>
+                                                                </select>
+                                                            </div>
+                                                             <div class="col-md-3 col-sm-4">
+                                                                <select type="text" class="form-control" >
+                                                                    <option>请选择</option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                      
+                                                        <div class="form-group">
+                                                            <div class="col-sm-offset-3 col-sm-8">
+                                                            <button type="submit" class="btn btn-info">保存</button>
+                                                            </div>
+                                                        </div>
+                                                        </form>
+                                                </div>
+                                               <!--添加对话框结束-->
                                         </div>
                                         </div>
                                     </div>
@@ -102,7 +132,8 @@
     </div>
 
     <link rel="import" href="/view/common/foot.html?__inline">
-    <script src="/js/main.js"></script>
+    <!--<script src="/js/main.js"></script>-->
+    <script src="/js/assess_management/assess_way.js?_inline"></script>
 </body>
 
 

VisualInspection/view/mytask/check.html

@@ -23,11 +23,11 @@
                 <label for="exampleInputAccount1" class="col-sm-1">考核人员</label>
                 <div class="col-sm-2">
                     <!-- 使用图片 -->
-                    <img data-toggle="lightbox" src="../../images/img4.jpg" data-image="../../images/img4.jpg" data-caption="小图看大图" alt="" width="50">
-                    <label for="exampleInputAccount1">0518 盛兴峰</label>
+                    <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="checkedPerson">0518 盛兴峰</label>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button">更改考核人员</button>
+                    <button class="btn btn-primary " type="button" data-toggle="modal" data-target="#changePersonWin">更改考核人员</button>
                 </div>
             </div>
         </form>
@@ -55,28 +55,28 @@
                 <div class="cards cards-borderless col-sm-11">
                     <div class="col-md-4 col-sm-6 col-lg-3">
                         <a href="#" style="color:red;"><i class="icon icon-remove-circle"></i> 删除</a>
-                        <a class="card" href="###">
+                        <a class="card lightbox-toggle" href="../../images/img4.jpg">
                             <img src="../../images/img4.jpg" alt="">
                             <div class="caption">“良辰美景” 出自《牡丹亭》</div>
                         </a>
                     </div>
                     <div class="col-md-4 col-sm-6 col-lg-3">
                         <a href="#" style="color:red;"><i class="icon icon-remove-circle"></i> 删除</a>
-                        <a class="card" href="###">
+                        <a class="card lightbox-toggle" href="../../images/img4.jpg">
                             <img src="../../images/img4.jpg" alt="">
                             <div class="caption">“良辰美景” 出自《牡丹亭》</div>
                         </a>
                     </div>
                     <div class="col-md-4 col-sm-6 col-lg-3">
                         <a href="#" style="color:red;"><i class="icon icon-remove-circle"></i> 删除</a>
-                        <a class="card" href="###">
+                        <a class="card lightbox-toggle" href="../../images/img4.jpg">
                             <img src="../../images/img4.jpg" alt="">
                             <div class="caption">“良辰美景” 出自《牡丹亭》</div>
                         </a>
                     </div>
                     <div class="col-md-4 col-sm-6 col-lg-3">
                         <a href="#" style="color:red;"><i class="icon icon-remove-circle"></i> 删除</a>
-                        <a class="card" href="###">
+                        <a class="card lightbox-toggle" href="../../images/img4.jpg">
                             <img src="../../images/img4.jpg" alt="">
                             <div class="caption">“良辰美景” 出自《牡丹亭》</div>
                         </a>
@@ -87,17 +87,26 @@
                     <button class="btn btn-primary" type="button">清空</button>
                     <br>
                     <br>
-                    <button class="btn btn-primary" type="button">评分</button>
+                    <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#scoreWin">评分</button>
                 </div>
             </div>
         </div>
         <div class="col-sm-6">
             <div class="datatable" data-checkable="true" data-sortable="true"></div>
-            <div class="col-sm-3">
-                <button class="btn btn-primary" type="button" onclick="showPre()">结果提交</button>
+            <div class="col-sm-2">
+                <button class="btn btn-primary" type="button" onclick="submitResult()">直接提交</button>
             </div>
-            <div class="col-sm-3">
-                <button class="btn btn-danger" type="button">申请无效</button>
+            <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>
         </div>
     </div>
@@ -106,21 +115,102 @@
 <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/add.html?__inline">
+            </div>
+        </div>
+    </div>
+</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>
 
+<!-- 对话框HTML -->
+<div class="modal fade" id="validSubmitWin">
+    <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">
+                <form  class="form-horizontal">
+                    <label for="exampleInputAccount1" class="col-sm-2">无效原因</label>
+                    <div class="form-group">
+                        <input class="col-sm-3" type="text" id="valid-reason" class="form-control" placeholder="原因">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="saveValidReason()">保存</button>
+            </div>
         </div>
+    </div>
+</div>
+<!-- 对话框HTML -->
+<div class="modal fade" id="refuseApplyWin">
+    <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>
+                <h4 class="modal-title">拒绝申请</h4>
             </div>
             <div class="modal-body">
-                <link rel="import" href="/view/constant/add.html?__inline">
+                <form  class="form-horizontal">
+                    <label for="exampleInputAccount1" class="col-sm-2">拒绝原因</label>
+                    <div class="form-group">
+                        <input class="col-sm-3" type="text" id="valid-reason" class="form-control" placeholder="原因">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="refuseApply()">保存</button>
+            </div>
+        </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() {
+        $('a.lightbox-toggle').lightbox();
         // 仅选择日期
         $("#start-time").datetimepicker({
             language: "zh-CN",
@@ -188,8 +278,31 @@
         });
     });
 
-    function showPre(id) {
-        // $('#myModal').modal({name:"dd"});
-        changePage("/view/mytask/taskDetail.html");
-    }
-</script>
+        function showPre(id){
+            // $('#myModal').modal({name:"dd"});
+            changePage("/view/mytask/taskDetail.html");
+        }
+
+        function saveValidReason(){
+            alert("提交成功！");
+            $('#validSubmitWin').modal('toggle');
+        }
+        function changePerson(id){
+            $('#checkedPerson').html(id);
+            $('#changePersonWin').modal('toggle');
+        }
+
+        function score(score){
+            alert("扣分："+score);
+            $('#scoreWin').modal('toggle');
+        }
+
+        function refuseApply(){
+            alert("拒绝申请");
+            $('#refuseApplyWin').modal('toggle');
+        }
+
+        function agreeApply(){
+            alert("同意申请");
+        }
+    </script>

VisualInspection/view/mytask/dispatched.html

@@ -21,9 +21,6 @@
                     <div class="col-sm-2">
                         <button class="btn btn-primary " type="button">查询</button>
                     </div>
-                    <div style="float:right;">
-                        <button class="btn btn-success" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 一键下发</button>
-                    </div>
                 </div>
             </form>
         </div>
@@ -107,11 +104,14 @@
                         {width: 160, text: '操作', type: 'string', flex: true, colClass: ''}
                     ],
                     rows: [
-                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','待审核','2017-04-05 10:00','<a href="###"><i class="icon-table"></i>查看结果</a>']},
-                        {checked: false, data: [2, '20170404收费站稽查任务','李敏','收费站','徐薇1','2017-04-04  00:00-24:00','待审核','2017-04-05 10:00','<a href="###"><i class="icon-table"></i>查看结果</a>']},
+                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','已下发','2017-04-05 10:00','<a href="###" onclick="showTaskDetail()"><i class="icon-table"></i>查看结果</a>']},
+                        {checked: false, data: [2, '20170404收费站稽查任务','李敏','收费站','徐薇1','2017-04-04  00:00-24:00','已下发','2017-04-05 10:00','<a href="###"><i class="icon-table"></i>查看结果</a>']},
                         // 更多数据
                     ]
                 }
             });
         });
+        function showTaskDetail(){
+            changePage("/view/mytask/taskDetail.html");
+        }
     </script>

VisualInspection/view/mytask/taskDetail.html

@@ -15,17 +15,40 @@
       </div>
       <div class="row">
         <h3>考核任务流程</h3>
-        <div class="page-header">
-            <table style="width:100%;">
-                <tr>
-                    <td width="25%">考核任务名：20170404收费站稽查任务</td>
-                    <td width="25%">考核人：李娟</td>
-                    <td width="25%">考核时间： 8:20-10:30</td>
-                    <td width="25%">考核视频数：2</td>
-                </tr>
-            </table>
+        <div>
+            <div class="col-sm-2" style="text-align:center;">
+                <div class="row">
+                    <label for="exampleInputAccount1">2017-05-12 10:00</label>
+                </div>
+                <div class="row">
+                    <label for="exampleInputAccount1">任务生成</label>
+                </div>
+                <div class="row" style="text-align:center;font-size:20px;">
+                    <i class="icon icon-circle"></i>
+                </div>
+            </div>
+            <div class="col-sm-1" style="text-align:center;">
+                <div class="row">
+                    <label for="exampleInputAccount1"></label>
+                </div>
+                <div class="row" style="text-align:center;font-size:20px;">
+                    <i class="icon icon-long-arrow-right"></i>
+                </div>
+            </div>    
+            <div class="col-sm-2" style="text-align:center;">
+                <div class="row">
+                    <label for="exampleInputAccount1">2017-05-12 11:00</label>
+                </div>
+                 <div class="row">
+                    <label for="exampleInputAccount1">任务稽查</label>
+                </div>
+                <div class="row" style="font-size:20px;">
+                    <i class="icon icon-circle"></i>
+                </div>
+            </div>
         </div>
       </div>
+      <hr>
       <div class="row">
         <h3>考核详细内容</h3>
         <div>
@@ -35,24 +58,26 @@
 </div>
 <script>
     $(document).ready(function() {
-            // 使用data参数更新数据：
-            $('.datatable').datatable( {
-                checkable:false,
-                sortable:false,
-                data: {
-                    cols: [
-                        {width: 30, text: '序号', type: 'number', flex: true, colClass: 'text-center'},
-                        {width: 100, text: '考核内容', type: 'string', flex: true, sort: 'down'},
-                        {width: 30, text: '扣分', type: 'string', flex: true, colClass: ''},
-                        {width: 200, text: '录像截图', type: 'string', flex: true, colClass: ''},
-                        {width: 100, text: '操作', type: 'string', flex: true, colClass: ''}
-                    ],
-                    rows: [
-                        {checked: false, data: [1, '未按规定收取过路费，着装不规范','10','<img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图" class="img-thumbnail" alt="" width="50"><img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图" class="img-thumbnail" alt="" width="50">',' <a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
-                        {checked: false, data: [2, '服务区垃圾房应封闭，房内垃圾入袋，地面无污水','20','<img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图"  alt="" width="500"> ','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
-                        // 更多数据
-                    ]
-                }
-            });
+        
+        // 使用data参数更新数据：
+        $('.datatable').datatable( {
+            checkable:false,
+            sortable:false,
+            data: {
+                cols: [
+                    {width: 30, text: '序号', type: 'number', flex: true, colClass: 'text-center'},
+                    {width: 100, text: '考核内容', type: 'string', flex: true, sort: 'down'},
+                    {width: 30, text: '扣分', type: 'string', flex: true, colClass: ''},
+                    {width: 200, text: '录像截图', type: 'string', flex: true, colClass: ''},
+                    {width: 100, text: '操作', type: 'string', flex: true, colClass: ''}
+                ],
+                rows: [
+                    {checked: false, data: [1, '未按规定收取过路费，着装不规范','10','<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 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 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 href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
+                    {checked: false, data: [2, '服务区垃圾房应封闭，房内垃圾入袋，地面无污水','20','<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 href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
+                    // 更多数据
+                ]
+            }
         });
+        $('a.lightbox-toggle').lightbox();
+    });
     </script>

VisualInspection/view/mytask/unchecked.html

@@ -1,150 +1,108 @@
-<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">
+    <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">
                             <option value="">全部</option>
                             <option value="1">东台收费站</option>
                             <option value="2">收费站</option>
                             <option value="3">收费站</option>
                         </select>
+                    </div>
+                    <div class="col-sm-2">
+                        <button class="btn btn-primary " type="button">查询</button>
+                    </div>
                 </div>
-                <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button">查询</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <br>
+            </form>
+        </div>
+        <br>
 
-    <div class="row">
-        <!-- 使用一个div来显示数据表格 -->
-        <div class="datatable" data-checkable="true" data-sortable="true"></div>
-    </div>
-    <div class="row" style="text-align:center">
-        <ul class="pager center-block">
-            <li class="previous"><a href="#">« 上一页</a></li>
-            <li><a href="#">1</a></li>
-            <li class="active"><a href="#">2</a></li>
-            <li><a href="#">3</a></li>
-            <li><a href="#">4</a></li>
-            <li><a href="#">5</a></li>
-            <li class="next"><a href="#">下一页 »</a></li>
-        </ul>
+        <div class="row">
+            <!-- 使用一个div来显示数据表格 -->
+            <div class="datatable" data-checkable="true" data-sortable="true"></div> 
+        </div>
+        <div class="row" style="text-align:center">
+            <ul class="pager center-block">
+                <li class="previous"><a href="#">« 上一页</a></li>
+                <li><a href="#">1</a></li>
+                <li class="active"><a href="#">2</a></li>
+                <li><a href="#">3</a></li>
+                <li><a href="#">4</a></li>
+                <li><a href="#">5</a></li>
+                <li class="next"><a href="#">下一页 »</a></li>
+            </ul>
+        </div>
     </div>
-</div>
-<!-- 对话框HTML -->
-<div class="modal fade" id="myModal">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
+    <!-- 对话框HTML -->
+    <div class="modal fade" id="myModal">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
             ...
+            </div>
         </div>
     </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"
+    <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"
+            });
+            // 使用data参数更新数据：
+            $('.datatable').datatable( {
+                checkable:false,
+                sortable:false,
+                data: {
+                    cols: [
+                        {width: 80, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
+                        {width: 160, text: '任务名称', type: 'date', flex: false, sort: 'down'},
+                        {width: 80, text: '考核人员', type: 'string', flex: true, colClass: ''},
+                        {width: 160, text: '考核部门', type: 'date', flex: false, sort: 'down'},
+                        {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: ''},
+                        {width: 160, text: '稽查时间段', type: 'date', flex: false, sort: 'down'},
+                        {width: 80, text: '状态', type: 'string', flex: true, colClass: ''},
+                        {width: 80, text: '操作', type: 'string', flex: true, colClass: ''}
+                    ],
+                    rows: [
+                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','未稽查','<a href="#" onclick="showCheck(1)"><i class="icon-ok-sign"></i>稽查</a>']},
+                        {checked: false, data: [2, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','未稽查','<a href="#" onclick="showCheck(2)"><i class="icon-ok-sign"></i>稽查</a>']},
+                        // 更多数据
+                    ]
+                }
+            });
         });
-        // 仅选择日期
-        $("#end-time").datetimepicker({
-            language: "zh-CN",
-            weekStart: 1,
-            todayBtn: 1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 使用data参数更新数据：
-        $('.datatable').datatable({
-            checkable: false,
-            sortable: false,
-            data: {
-                cols: [{
-                    width: 80,
-                    text: '序号',
-                    type: 'number',
-                    flex: false,
-                    colClass: 'text-center'
-                }, {
-                    width: 160,
-                    text: '任务名称',
-                    type: 'date',
-                    flex: false,
-                    sort: 'down'
-                }, {
-                    width: 80,
-                    text: '考核人员',
-                    type: 'string',
-                    flex: true,
-                    colClass: ''
-                }, {
-                    width: 160,
-                    text: '考核部门',
-                    type: 'date',
-                    flex: false,
-                    sort: 'down'
-                }, {
-                    width: 80,
-                    text: '稽查人员',
-                    type: 'string',
-                    flex: true,
-                    colClass: ''
-                }, {
-                    width: 160,
-                    text: '稽查时间段',
-                    type: 'date',
-                    flex: false,
-                    sort: 'down'
-                }, {
-                    width: 80,
-                    text: '状态',
-                    type: 'string',
-                    flex: true,
-                    colClass: ''
-                }, {
-                    width: 80,
-                    text: '操作',
-                    type: 'string',
-                    flex: true,
-                    colClass: ''
-                }],
-                rows: [{
-                        checked: false,
-                        data: [1, '20170404收费站稽查任务', '李敏', '收费站', '徐薇', '2017-04-04  00:00-24:00', '未稽查', '<a href="#" onclick="showCheck(1)"><i class="icon-ok-sign"></i>稽查</a>']
-                    }, {
-                        checked: false,
-                        data: [2, '20170404收费站稽查任务', '李敏', '收费站', '徐薇', '2017-04-04  00:00-24:00', '未稽查', '<a href="#" onclick="showCheck(2)"><i class="icon-ok-sign"></i>稽查</a>']
-                    },
-                    // 更多数据
-                ]
-            }
-        });
-    });
-
-    function showCheck(id) {
-        // $('#myModal').modal({name:"dd"});
-        changePage("/view/mytask/check.html");
-    }
-</script>
+        function showCheck(id){
+            // $('#myModal').modal({name:"dd"});
+            changePage("/view/mytask/check.html");
+        }
+    </script>

VisualInspection/view/mytask/undispatched.html

@@ -22,7 +22,7 @@
                         <button class="btn btn-primary " type="button">查询</button>
                     </div>
                     <div style="float:right;">
-                        <button class="btn btn-success" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 一键下发</button>
+                        <button class="btn btn-success" type="button" onclick="dispatchAll()"><i class="icon icon-plus-sign"></i> 一键下发</button>
                     </div>
                 </div>
             </form>
@@ -107,11 +107,22 @@
                         {width: 160, text: '操作', type: 'string', flex: true, colClass: ''}
                     ],
                     rows: [
-                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','待审核','2017-04-05 10:00','<a href="###"><i class="icon-envelope"></i>下发任务 </a><a href="###"><i class="icon-table"></i>查看结果</a>']},
+                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','待审核','2017-04-05 10:00','<a href="###" onclick="dispatch()"><i class="icon-envelope"></i>下发任务 </a><a href="###" onclick="showTaskDetail()"><i class="icon-table"></i>查看结果</a>']},
                         {checked: false, data: [2, '20170404收费站稽查任务','李敏','收费站','徐薇1','2017-04-04  00:00-24:00','待审核','2017-04-05 10:00','<a href="###"><i class="icon-envelope"></i>下发任务 </a><a href="###"><i class="icon-table"></i>查看结果</a>']},
                         // 更多数据
                     ]
                 }
             });
         });
+
+        function dispatch(){
+            alert("下发成功！");
+        }
+
+        function dispatchAll(){
+            alert("下发成功！");
+        }
+        function showTaskDetail(){
+            changePage("/view/mytask/taskDetail.html");
+        }
     </script>

VisualInspection/view/mytask/unexamined.html

@@ -104,11 +104,15 @@
                         {width: 80, text: '操作', type: 'string', flex: true, colClass: ''}
                     ],
                     rows: [
-                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','待审核','无车辆进出','<a href="###"><i class="icon-ok-sign"></i>审核</a>']},
+                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','待审核','无车辆进出','<a href="###" onclick="showExamine(1)"><i class="icon-ok-sign"></i>审核</a>']},
                         {checked: false, data: [2, '20170404收费站稽查任务','李敏','收费站','徐薇1','2017-04-04  00:00-24:00','待审核','无车辆进出','<a href="###"><i class="icon-ok-sign"></i>审核</a>']},
                         // 更多数据
                     ]
                 }
             });
         });
+         function showExamine(id){
+            // $('#myModal').modal({name:"dd"});
+            changePage("/view/mytask/check.html");
+        }
     </script>