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

# Conflicts:
#	VisualInspection/js/util/util.js
#	VisualInspection/view/mytask/check.html
#	VisualInspection/view/mytask/unchecked.html

VisualInspection/js/main.js

@@ -10,7 +10,8 @@ $(document).ready(function() {
         if ($(this).hasClass("p_m")) { return; }
         $('#treeMenu li.active').removeClass('active');
         $(this).closest('li').addClass('active');
-        $("#main_content").html(getPageInfo(this.id));
+        getPageInfo(this.id)
+            // $("#main_content").html(getPageInfo(this.id));
     });
 
     //获取用户信息
@@ -72,67 +73,75 @@ function setletftime() {
 
 function getPageInfo(id) {
     var html = "";
-// <<<<<<< HEAD
-//     switch (id) {
-//         case "1_1":
-//             {
-//                 html = __inline('/view/mytask/unchecked.html');
-//                 break;
-//             }
-//         case "1_1_1":
-//             {
-//                 html = __inline('/view/mytask/check.html');
-//                 break;
-//             }
-//          case "1_1_1_1":
-//             {
-//                 html = __inline('/view/mytask/preSubmit.html');
-//                 break;
-//             }
-//         case "1_2":
-//             {
-//                 html = __inline('/view/mytask/unexamined.html');
-//                 break;
-//             }
-//          case "1_3":
-//             {
-//                 html = __inline('/view/mytask/undispatched.html');
-//                 break;
-//             }
-//          case "1_4":
-//             {
-//                 html = __inline('/view/mytask/dispatched.html');
-//                 break;
-//             }
-//         case "7_5":
-//             {
-//                 html = __inline('/view/constant/constant.html');
-//                 break;
-// =======
+    // <<<<<<< HEAD
+    //     switch (id) {
+    //         case "1_1":
+    //             {
+    //                 html = __inline('/view/mytask/unchecked.html');
+    //                 break;
+    //             }
+    //         case "1_1_1":
+    //             {
+    //                 html = __inline('/view/mytask/check.html');
+    //                 break;
+    //             }
+    //          case "1_1_1_1":
+    //             {
+    //                 html = __inline('/view/mytask/preSubmit.html');
+    //                 break;
+    //             }
+    //         case "1_2":
+    //             {
+    //                 html = __inline('/view/mytask/unexamined.html');
+    //                 break;
+    //             }
+    //          case "1_3":
+    //             {
+    //                 html = __inline('/view/mytask/undispatched.html');
+    //                 break;
+    //             }
+    //          case "1_4":
+    //             {
+    //                 html = __inline('/view/mytask/dispatched.html');
+    //                 break;
+    //             }
+    //         case "7_5":
+    //             {
+    //                 html = __inline('/view/constant/constant.html');
+    //                 break;
+    // =======
     if (typeof(MENU) != undefined && MENU != null) {
         for (var i = 0; i < MENU.length; i++) {
             var menu = MENU[i];
             if (menu.id == id) {
-                html = ViewMap.get(menu.url)
-                return html;
-// >>>>>>> 6978fa77a9a7e5344baa483d99e33add210204a8
+                if (typeof(mtemp.url) != "undefined") {
+                    $("#main_content").load(base_ui_url + mtemp.url);
+                    return;
+                }
+                break;
             }
             if (menu.childs.length > 0) {
                 for (var j = 0; j < menu.childs.length; j++) {
                     var mtemp = menu.childs[j];
                     if (mtemp.id == id) {
-                        html = ViewMap.get(mtemp.url)
-                        return html;
+                        if (typeof(mtemp.url) != "undefined") {
+                            $("#main_content").load(base_ui_url + mtemp.url);
+                            return;
+                        }
+                        break;
                     }
                 }
             }
 
         }
     }
-    return __inline('/view/user/aa.html');
+    return $("#main_content").load(base_ui_url + "/view/user/aa.html");
+
 
 }
 
-function changePage(page) {
-    $("#main_content").html(page);
+function changePage(url) {
+    if (typeof(url) != "undefined") {
+        $("#main_content").load(base_ui_url + url);
+    }
 }

VisualInspection/js/util/util.js

@@ -62,11 +62,9 @@ function ajaxDelete(dataurl, data, sucessCallBack, errorCallBack) {
 }
 
 
-var ViewMap = new HashMap();
-ViewMap.set("/view/mytask/unchecked.html", __inline('/view/mytask/unchecked.html'));
-ViewMap.set("/view/mytask/unexamined.html", __inline('/view/mytask/unexamined.html'));
-ViewMap.set("/view/mytask/undispatched.html", __inline('/view/mytask/undispatched.html'));
-ViewMap.set("/view/mytask/dispatched.html", __inline('/view/mytask/dispatched.html'));
-ViewMap.set("/view/mytask/check.html", __inline('/view/mytask/check.html'));
-ViewMap.set("/view/mytask/taskDetail.html", __inline('/view/mytask/taskDetail.html'));
-ViewMap.set("/view/constant/constant.html", __inline('/view/constant/constant.html'));
+// var ViewMap = new HashMap()
+// ViewMap.set("/view/mytask/unchecked.html", __inline('/view/mytask/unchecked.html'));
+// ViewMap.set("/view/mytask/unexamined.html", __inline('/view/mytask/unexamined.html'));
+// ViewMap.set("/view/mytask/undispatched.html", __inline('/view/mytask/undispatched.html'));
+// ViewMap.set("/view/mytask/dispatched.html", __inline('/view/mytask/dispatched.html'));
+// ViewMap.set("/view/constant/constant.html", __inline('/view/constant/constant.html'));

VisualInspection/view/assess_management/assess_item.html

@@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>稽查</title>
+    <link rel="import" href="/view/common/commoncsslink.html?__inline">
+    <link rel="stylesheet" type="text/css" href="/css/main.css">    
+    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
+</head>
+
+<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">
+                </div>
+            </div>
+            <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>
+                    </div>
+
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+
+    <link rel="import" href="/view/common/foot.html?__inline">
+    <script src="/js/main.js"></script>
+</body>
+
+
+</html>

VisualInspection/view/assess_management/assess_way.html

@@ -0,0 +1,109 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>稽查</title>
+    <link rel="import" href="/view/common/commoncsslink.html?__inline">
+    <link rel="stylesheet" type="text/css" href="/css/main.css">    
+    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
+</head>
+
+<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">
+                </div>
+            </div>
+            <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 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">
+                                                    <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 style="float:right;">
+                                                <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 添加</button>
+                                            </div>
+                                        </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>
+                                    </div>
+                                    <!-- 对话框HTML -->
+                                    <div class="modal fade" id="myModal">
+                                        <div class="modal-dialog">
+                                            <div class="modal-content">
+                                                
+                                            </div>
+                                            <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>
+                            <!-- 考核办法  end -->          
+                        </div>
+                    </div>
+
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+
+    <link rel="import" href="/view/common/foot.html?__inline">
+    <script src="/js/main.js"></script>
+</body>
+
+
+</html>

VisualInspection/view/mytask/check.html

@@ -1,171 +1,192 @@
-    <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">
-                        <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">
+                    <select class="form-control">
                             <option value="">全部</option>
                             <option value="1">东台收费站</option>
                             <option value="2">收费站</option>
                             <option value="3">收费站</option>
                         </select>
-                    </div>
-                    <label for="exampleInputAccount1" class="col-sm-1">车道号</label>
-                    <div class="col-sm-2">
-                        <select class="form-control">
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">车道号</label>
+                <div class="col-sm-2">
+                    <select class="form-control">
                             <option value="">1</option>
                             <option value="1">2</option>
                             <option value="2">3</option>
                             <option value="3">4</option>
                         </select>
-                    </div>
-                    <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>
-                    </div>
-                    <div class="col-sm-2">
-                        <button class="btn btn-primary " type="button">更改考核人员</button>
-                    </div>
                 </div>
-            </form>
-        </div>
+                <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>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary " type="button">更改考核人员</button>
+                </div>
+            </div>
+        </form>
+    </div>
 
-        <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 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="row">
-                    <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="###">
+                <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 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="###">
                             <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>
+                    </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="###">
                             <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>
+                    </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="###">
                             <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>
+                    </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="###">
                             <img src="../../images/img4.jpg" alt="">
                             <div class="caption">“良辰美景” 出自《牡丹亭》</div>
-                            </a>
-                        </div>
+                        </a>
                     </div>
-                    <div class="col-sm-1">
-                        <br>
-                        <button class="btn btn-primary" type="button">清空</button>
-                        <br>
-                        <br>
-                        <button class="btn btn-primary" type="button">评分</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>
-                <div class="col-sm-3">
-                    <button class="btn btn-danger" type="button">申请无效</button>
+                <div class="col-sm-1">
+                    <br>
+                    <button class="btn btn-primary" type="button">清空</button>
+                    <br>
+                    <br>
+                    <button class="btn btn-primary" type="button">评分</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>
+            <div class="col-sm-3">
+                <button class="btn btn-danger" type="button">申请无效</button>
+            </div>
+        </div>
     </div>
-    <!-- 对话框HTML -->
-    <div class="modal fade" id="myModal">
+</div>
+<!-- 对话框HTML -->
+<div class="modal fade" id="myModal">
     <div class="modal-dialog">
         <div class="modal-content">
-            
+
         </div>
         <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 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>
-    <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: 30, text: '序号', type: 'number', flex: true, colClass: 'text-center'},
-                        {width: 200, text: '评分记录', type: 'string', flex: true, sort: 'down'},
-                        {width: 30, text: '分数', type: 'string', flex: true, colClass: ''},
-                        {width: 100, text: '操作', type: 'string', flex: true, colClass: ''}
-                    ],
-                    rows: [
-                        {checked: false, data: [1, '服务设施维修及时，小修及时修复','10','<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="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
-                        // 更多数据
-                    ]
-                }
-            });
+</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"
+        });
+        // 使用data参数更新数据：
+        $('.datatable').datatable({
+            checkable: false,
+            sortable: false,
+            data: {
+                cols: [{
+                    width: 30,
+                    text: '序号',
+                    type: 'number',
+                    flex: true,
+                    colClass: 'text-center'
+                }, {
+                    width: 200,
+                    text: '评分记录',
+                    type: 'string',
+                    flex: true,
+                    sort: 'down'
+                }, {
+                    width: 30,
+                    text: '分数',
+                    type: 'string',
+                    flex: true,
+                    colClass: ''
+                }, {
+                    width: 100,
+                    text: '操作',
+                    type: 'string',
+                    flex: true,
+                    colClass: ''
+                }],
+                rows: [{
+                        checked: false,
+                        data: [1, '服务设施维修及时，小修及时修复', '10', '<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="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']
+                    },
+                    // 更多数据
+                ]
+            }
         });
+    });
 
         function showPre(id){
             // $('#myModal').modal({name:"dd"});