修改bug

VisualInspection/fis-conf.js

@@ -29,13 +29,25 @@ fis.match('*.png', {
     optimizer: fis.plugin('png-compressor')
 });
 
-fis.set('date', new Date);
+Date.prototype.Format = function (fmt) { //author: meizz 
+    var o = {
+        "M+": this.getMonth() + 1, //月份 
+        "d+": this.getDate(), //日 
+        "H+": this.getHours(), //小时 
+        "m+": this.getMinutes(), //分 
+        "s+": this.getSeconds(), //秒 
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
+        "S": this.getMilliseconds() //毫秒 
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+fis.set('date', new Date().Format("yyyyMMddHHmmss"));
 
 fis.match('*.{js,css,png}', {
-    query: '?time=' + (fis.get('date').getYear() + 1900) 
-                 + (fis.get('date').getMonth() + 1) 
-                 + (fis.get('date').getDate())+(fis.get('date').getHours())
-                 + (fis.get('date').getMinutes())+(fis.get('date').getSeconds())
+    query: '?time=' + fis.get('date')
 });
 
 // Global end

VisualInspection/js/appeal_management/appeal_list.js

@@ -106,7 +106,7 @@ function queryAppeal(){
     if(cur_status==12 || cur_status==13){
         data.check_status_arr = [12,13];
     }
-    $('.datatable').mytable({'cols':cols,
+    $('#appeal_list_table').mytable({'cols':cols,
                             'url':"/checkAppeal/getTaskList",
                             'param':data}
                             );
@@ -117,7 +117,7 @@ function queryAppeal(){
 function seeCheckAudit(id,task_id){
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
-    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
         if(!data) {
             layer.msg('未获取到申诉内容！',{
@@ -173,14 +173,14 @@ function queryUnAssignedTable(){
                         ]},
                     ] ;
         
-        $('.datatable').mytable({'cols':cols,
+        $('#appeal_list_table').mytable({'cols':cols,
                                 'url':"checkAppeal/getList",
                                 'param':data}
                                 );
     }
 //进入稽查页面
 function showAppealCheck(id){
-    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
         if(!data) {
             layer.msg('未获取到申诉内容！',{
@@ -199,7 +199,7 @@ function showAppealCheck(id){
 //进入继续稽查页面
 function showAppealContinueCheck(id){
     // $('#myModal').modal({name:"dd"});
-    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
         if(!data) {
             layer.msg('未获取到申诉内容！',{
@@ -228,7 +228,7 @@ function dispatchAppealTaskById(id){
     layer.confirm('确定下发任务？', {
         btn: ['确定','取消'] //按钮
     }, function(){
-       var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+       var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
        var param = {
             "id": rowData.id,
             "check_status":15

VisualInspection/js/config.js

@@ -13,7 +13,7 @@ function getCurrentaddr() {
 }
 
 function getserveraddr() {
-    if (base_ui_url.indexOf("jsjtyxt.com") != -1) {
+    if (base_ui_url.indexOf("file_yanhai.jsxt.jsjtyxt.com") != -1) {
         return "http://server_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://server_release_yanhai.jsxt.jsjtyxt.com/";
@@ -28,7 +28,7 @@ function getserveraddr() {
 }
 
 function getImageaddr() {
-    if (base_ui_url.indexOf("jsjtyxt.com") != -1) {
+    if (base_ui_url.indexOf("file_yanhai.jsxt.jsjtyxt.com") != -1) {
         return "http://file_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://file_release_yanhai.jsxt.jsjtyxt.com/";

VisualInspection/js/mytask/task_list.js

@@ -124,7 +124,7 @@ function queryTask(){
     if(cur_status==2 || cur_status==3){
         data.check_status_arr = [2,3];
     }
-    $('.datatable').mytable({'cols':cols,
+    $('#task_list_table').mytable({'cols':cols,
                             'checkable':checkable,
                             'url':"/task/getTaskList/",
                             'param':data}
@@ -134,7 +134,7 @@ function queryTask(){
 //进入稽查页面
 function showCheck(id){
     // $('#myModal').modal({name:"dd"});
-    $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    $.checkTask =getItemByIdFromArr(id,$('#task_list_table').mytable('getTableData'));
     $.checkTask.appeal = null;
     //开始稽查
     no_return_common_service('/task/update', {"id":$.checkTask.id,"check_status":3});
@@ -143,7 +143,7 @@ function showCheck(id){
 //进入继续稽查页面
 function showContinueCheck(id){
     // $('#myModal').modal({name:"dd"});
-    $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    $.checkTask =getItemByIdFromArr(id,$('#task_list_table').mytable('getTableData'));
     $.checkTask.appeal = null;
     changePage("/view/mytask/check.html");
 }
@@ -197,7 +197,7 @@ function refuseApply(taskId){
 }
 //任务详情页面
 function showTaskDetail(id){
-    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    var rowData=getItemByIdFromArr(id,$('#task_list_table').mytable('getTableData'));
     $.checkTask = rowData;
     if(typeof($.checkTask)!="undefined" && typeof($.checkTask.appeal) != "undefined"){
         $.checkTask.appeal = null;
@@ -210,7 +210,7 @@ function showTaskDetail(id){
 function dispatchTaskPatch(){
      var param = {
         "check_status":4,
-        "dispatch_ids":$('.datatable').mytable('getTableCheckedIds')
+        "dispatch_ids":$('#task_list_table').mytable('getTableCheckedIds')
     }
     console.log("放假啦:"+param.dispatch_ids);
     // if(!param.dispatch_ids || param.dispatch_ids.length==0){
@@ -231,7 +231,7 @@ function dispatchTaskPatch(){
     }, function(index){
         layer.close(index);
     });
-   var datas = $('.datatable').mytable('getTableData');
+   var datas = $('#task_list_table').mytable('getTableData');
    console.log(datas);
 }
 //下发单条任务

VisualInspection/view/appeal_management/appeal_list.html

@@ -33,7 +33,7 @@
         <hr style="margin-top:0px;">
         <div class="row">
             <!-- 使用一个div来显示数据表格 -->
-            <div class="datatable" data-checkable="true" data-sortable="true"></div>
+            <div class="datatable" id="appeal_list_table" data-checkable="true" data-sortable="true"></div>
         </div>
         
 

VisualInspection/view/mytask/taskDetail.html

@@ -170,6 +170,7 @@
                     {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                     {width: 60, 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: 'string', flex: true, colClass: '',field: 'checked_person_name'},
                     {width: 80, text: '备注', type: 'string', flex: true, colClass: '',field: 'remark'},
                     {width: 200, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'}
                 ];

VisualInspection/view/mytask/task_list.html

@@ -57,7 +57,7 @@
     </div>
     <hr style="margin-top:0px;">
 
-    <div class="datatable"></div>
+    <div class="datatable" id="task_list_table"></div>
 </div>
 <script>
     $(document).ready(function() {