代码

VisualInspection/fwq/js/task/check.js

@@ -585,7 +585,7 @@ function genPicstr(imgSrc) {
 
     var pic = '<div class="img_item" style="width:100px;height:90px;float:left;">' +
         '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>' +
-        (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+        (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
         '<img class="pic-class img-thumbnail" path="' + imgSrc + '" style="width:100px;height:70px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 20px;left: 40px;color: white;"></i>') +
         '</a>' +
         '</div>';

VisualInspection/fwq/view/main.html

@@ -81,6 +81,15 @@
 
         </div>
     </div>
+    <div style="position:absolute;width:100%;height:100%;z-index: 100;background:rgba(0,0,0,0.5);top:0;left:0;display:none" id="videodiv">
+        <div style="position:absolute;left:50%;top:50%; transform: translate(-50%, -50%);width:800px;height:600px;" >
+     <button id="videoClose" type="button" class="close" data-dismiss="modal" ><span aria-hidden="true" >×</span><span class="sr-only">关闭</span></button>
+       <div id="videoDiv" class="video tab-pane active" style="width:100%;height:100%;"></div>
+        </div>
+    </div>
+    <script type="text/javascript" src="/js/lib/ckplayer/ckplayer/ckplayer.js"></script>
+
+
 
     <script src="/js/main.js"></script>
     <script src="/fwq/js/task/check.js"></script>

VisualInspection/fwq/view/task/taskDetail.html

@@ -281,7 +281,7 @@
 
                 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>' +
-                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
                     '<img class="pic-class img-thumbnail" style="width:200px;height:150px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 40px;left:80px;color: white;"></i>') +
                     '</a>' +
                     '</div>';

VisualInspection/js/config.js

@@ -20,7 +20,7 @@ function getserveraddr() {
         return "http://server_release_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         //return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
-        return "http://localhost:8089/"
+        return "http://localhost:8086/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {

VisualInspection/js/lib/mytable.js

@@ -183,7 +183,7 @@ String.prototype.replaceAll = function(s1, s2) {
                                     src = src.split('.MP4')[0] + "_screen_0.png"
                                     ispic = false;
                                 }
-                                var pic = (ispic ? '<a class="card lightbox-toggle" onclick="img_play(\'' + src + '\')" href="javascript:void(0)" style="width:60px;height:50px;float:left;">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="width:60px;height:50px;">') +
+                                var pic = (ispic ? '<a class="card lightbox-toggle" onclick="img_play(\'' + src + '\')" href="javascript:void(0)" style="width:60px;height:50px;float:left;">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="width:60px;height:50px;">') +
                                     '<img class="pic-class  img-thumbnail" style="width:60px;height:50px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 10px;left: 15px;color: white;"></i>') +
                                     '</a>';
                                 picStr += pic;
@@ -232,7 +232,7 @@ String.prototype.replaceAll = function(s1, s2) {
 
                                 var pic = '<div class="img_item" style="width:80px;height:45px;display:inline-block;margin-right:5px">' +
                                     '<a href="javascript:void(0)" onclick="removeVideo(\'' + obj.id + '\',\'' + pics + '\',\'' +cols[i].field+'\',\''+ j + '\')" style="float:right;position:relative;z-index:100;font-size:10px"><span class="label label-danger" style="padding:0"><i class="icon icon-remove-circle"></i> 删除</span></a>' +
-                                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+                                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
                                     '<img class="pic-class img-thumbnail" path="' + videosrc + '" style="width:80px;height:45px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 20px;position: absolute;top: 15px;left: 30px;color: white;"></i>') +
                                     '</a>' +
                                     '</div>';

VisualInspection/js/main.js

@@ -3,6 +3,11 @@ var myTree;
 
 //计算左面的
 $(document).ready(function() {
+
+    $("#videoClose").on("click",function(){
+        $("#videodiv").css("display","none");
+        closeVideo();
+     })
     // $('#mum_left').perfectScrollbar();
     $('#mum_left').height($(document).height() - 60);
     $('#main_panel').height($(document).height() - 100);

VisualInspection/js/mytask/check.js

@@ -287,10 +287,10 @@ function checkUserCount() {
         "class_type": $.checkTask.class_type
     };
     post_common_service("/task/getUserCount/", param, function(data) {
-        if (data >= 2) {
+        if (data >= 1) {
             layer.msg("本周期稽查次数已满，不能再被稽查！", {
                 offset: 'r',
-                time: 2000 //20s后自动关闭
+                time: 2000 //20s后自动关闭`
             });
             return false;
         }
@@ -615,7 +615,7 @@ function genPicstr(imgSrc) {
 
     var pic = '<div class="img_item" style="width:100px;height:90px;float:left;">' +
         '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>' +
-        (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+        (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
         '<img class="pic-class img-thumbnail" path="' + imgSrc + '" style="width:100px;height:70px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 20px;left: 40px;color: white;"></i>') +
         '</a>' +
         '</div>';
@@ -684,8 +684,10 @@ function changePerson(id) {
             "checked_person": id,
             "class_type": $.checkTask.class_type
         };
+        // console.log(param);
         post_common_service("/task/getUserCount/", param, function(data) {
-            if (data && data.length >= 2) {
+                 console.log(data);
+            if (data && data.length >= 1) {
                 layer.msg("本周期稽查次数已满，不能再被稽查！", {
                     time: 2000, //20s后自动关闭
                     offset: 'r'

VisualInspection/js/statistics/assess_ranking.js

@@ -683,7 +683,7 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date,
 
     var btn_html = "";
     if (checknum < 6) {
-        btn_html = '<button class="btn btn-primary" style="margin:20px;margin-right:10px" onclick="creatTask()" type="button">生成任务</button>';
+        btn_html = '<button id="taskCreate" class="btn btn-primary load-indicator" style="margin:20px;margin-right:10px" onclick="creatTask()" type="button">生成任务</button>';
     }
     var html = css + '<div class="row row_alert" style="padding-left:10px;padding-right:10px;">' + table1 + '</div><div class="row row_alert" style="bottom: 0;position: absolute;width: 100%;text-align: center;}">' +
         '<div class="col-xs-4">' + tips + '</div><div class="col-xs-3">' + selectdiv + '</div><div class="col-xs-3"><span class="selecttag" style="text-align: right;">请分配对应的稽查人员：</span></div><div class="col-xs-2  class="selecttag""><select data-placeholder="选择稽查员" id="selectusers" class="chosen-select form-control" >' +
@@ -760,15 +760,15 @@ function selectTeamClass(obj) {
 }
 
 function creatTask() {
-
-    if (parseInt(data_p.checknum) >= 6) {
-        tip("已经生成了6次");
+    // console.log(1111);
+    if (parseInt(data_p.checknum) >= 3) {
+        tip("已经生成了3次");
         return;
     }
 
     //获取classid
     var id = $("#selectedclass").attr('data');
-
+    document.getElementById("taskCreate").className = "btn load-indicator loading"; 
     //获取userid
     var userid = $("#selectusers").val();
     if (id != null && typeof(id) != "undefined") {
@@ -791,6 +791,7 @@ function creatTask() {
                 var data = response;
                 if (data.result_code == 0) {
                     tip("生成成功", null)
+                    document.getElementById("taskCreate").className = "btn btn-primary load-indicator"; 
                     if ($("#layerhtml").length > 0 && data_p != null) {
 
                         //获取该人员排班
@@ -826,6 +827,7 @@ function creatTask() {
                 }
             },
             error: function(error) {
+                document.getElementById("taskCreate").className = "btn btn-primary load-indicator"; 
                 tip("网络错误", null)
             }
         })

VisualInspection/js/statistics/check_workload_statistics.js

@@ -126,9 +126,8 @@ $(function() {
         var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
         var end_date = $(".div-end input").val() + " 23:00:00";
         if ($("#select-personal").val() != '') {
-            param += "&user_id=" + $("#select-personal").val();
+            param += "&user_id=" + $("#select-personal").val()+"&score_flag="+$(".score-select").val();
         }
-
         window.open(getserveraddr() + "/file/check/info?queryType=1&start_date=" + start_date + '&end_date=' + end_date + param);
     })
 

VisualInspection/js/util/media.js

@@ -86,9 +86,28 @@ function video_paly(src) {
             lpayer.height(height - 40);
         }
     });
+}
 
+function videoCkplayer(src){
+    $('#videodiv').css('display','block');
+    //alert(src);
+    var videoObject = {
+        container: '.video', //“#”代表容器的ID，“.”或“”代表容器的class
+        variable: 'player', //该属性必需设置，值等于下面的new chplayer()的对象
+        //poster: 'pic/wdm.jpg', //封面图片
+        autoplay: true,
+       // loaded:'loadedHandler',//监听播放器加载成功
+        video:src  //视频地址
+       // video: "file:///H://N3J4803_00030220180708095248_1289.MP4"   //视频地址
+    };
+    videoPlayer = new ckplayer(videoObject);
+    // videoPlayer.fullScreen();
+    videoPlayer.videoProportion(200,300);
+    // videoPlayer.videoZoom(1);
+   // console.log(videoPlayer.getStatus());
+   // videoPlayer.addListener('time', timeHandler);
+}
 
-
-
-
-}
+function closeVideo(){
+        videoPlayer.videoPause();
+    }

VisualInspection/package-lock.json

@@ -10,12 +10,12 @@
       "integrity": "sha1-SiITWZUsKLLe0sYS5nc2mmR89X0=",
       "requires": {
         "aes-decrypter": "3.0.0",
-        "global": "4.3.2",
+        "global": "^4.3.0",
         "m3u8-parser": "4.2.0",
         "mpd-parser": "0.6.1",
         "mux.js": "4.5.0",
-        "url-toolkit": "2.1.4",
-        "video.js": "7.2.0"
+        "url-toolkit": "^2.1.3",
+        "video.js": "^6.8.0 || ^7.0.0"
       }
     },
     "aes-decrypter": {
@@ -23,9 +23,9 @@
       "resolved": "http://registry.npm.taobao.org/aes-decrypter/download/aes-decrypter-3.0.0.tgz",
       "integrity": "sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=",
       "requires": {
-        "commander": "2.17.1",
-        "global": "4.3.2",
-        "pkcs7": "1.0.2"
+        "commander": "^2.9.0",
+        "global": "^4.3.2",
+        "pkcs7": "^1.0.2"
       }
     },
     "babel-runtime": {
@@ -33,8 +33,8 @@
       "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "2.5.7",
-        "regenerator-runtime": "0.11.1"
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       }
     },
     "blueimp-md5": {
@@ -75,7 +75,7 @@
       "resolved": "http://registry.npm.taobao.org/for-each/download/for-each-0.3.3.tgz",
       "integrity": "sha1-abRH6IoKXTLD5whPPxcQA0shN24=",
       "requires": {
-        "is-callable": "1.1.4"
+        "is-callable": "^1.1.3"
       }
     },
     "global": {
@@ -83,8 +83,8 @@
       "resolved": "http://registry.npm.taobao.org/global/download/global-4.3.2.tgz",
       "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
       "requires": {
-        "min-document": "2.19.0",
-        "process": "0.5.2"
+        "min-document": "^2.19.0",
+        "process": "~0.5.1"
       }
     },
     "hashmap": {
@@ -127,7 +127,7 @@
       "resolved": "http://registry.npm.taobao.org/min-document/download/min-document-2.19.0.tgz",
       "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
       "requires": {
-        "dom-walk": "0.1.1"
+        "dom-walk": "^0.1.0"
       }
     },
     "moment": {
@@ -140,8 +140,8 @@
       "resolved": "http://registry.npm.taobao.org/mpd-parser/download/mpd-parser-0.6.1.tgz",
       "integrity": "sha1-J+eq/gdYF4Rs5VQGrANxHfHODrc=",
       "requires": {
-        "global": "4.3.2",
-        "url-toolkit": "2.1.4"
+        "global": "^4.3.0",
+        "url-toolkit": "^2.1.1"
       }
     },
     "ms": {
@@ -164,7 +164,7 @@
       "resolved": "http://registry.npm.taobao.org/parse-headers/download/parse-headers-2.0.1.tgz",
       "integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=",
       "requires": {
-        "for-each": "0.3.3",
+        "for-each": "^0.3.2",
         "trim": "0.0.1"
       }
     },
@@ -188,7 +188,7 @@
       "resolved": "http://registry.npm.taobao.org/rust-result/download/rust-result-1.0.0.tgz",
       "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
       "requires": {
-        "individual": "2.0.0"
+        "individual": "^2.0.0"
       }
     },
     "safe-json-parse": {
@@ -196,7 +196,7 @@
       "resolved": "http://registry.npm.taobao.org/safe-json-parse/download/safe-json-parse-4.0.0.tgz",
       "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
       "requires": {
-        "rust-result": "1.0.0"
+        "rust-result": "^1.0.0"
       }
     },
     "trim": {
@@ -214,7 +214,7 @@
       "resolved": "http://registry.npm.taobao.org/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha1-qX7nqf9CaRufeD/xvFES/j/KkIA=",
       "requires": {
-        "is-typedarray": "1.0.0"
+        "is-typedarray": "^1.0.0"
       }
     },
     "url-toolkit": {
@@ -228,7 +228,7 @@
       "integrity": "sha1-SVzspG4IWEObpE12VXdEs8UtAyM=",
       "requires": {
         "@videojs/http-streaming": "1.2.1",
-        "babel-runtime": "6.26.0",
+        "babel-runtime": "^6.9.2",
         "global": "4.3.2",
         "safe-json-parse": "4.0.0",
         "tsml": "1.0.1",
@@ -247,7 +247,7 @@
       "resolved": "http://registry.npm.taobao.org/videojs-vtt.js/download/videojs-vtt.js-0.14.1.tgz",
       "integrity": "sha1-2lg+sfycgcgmqUMrcGBA6N6kmRE=",
       "requires": {
-        "global": "4.3.2"
+        "global": "^4.3.1"
       }
     },
     "websocket": {
@@ -255,10 +255,10 @@
       "resolved": "http://registry.npm.taobao.org/websocket/download/websocket-1.0.26.tgz",
       "integrity": "sha1-oDoBKZhJw1JoyDBEqpGcY3S+gZQ=",
       "requires": {
-        "debug": "2.6.9",
-        "nan": "2.10.0",
-        "typedarray-to-buffer": "3.1.5",
-        "yaeti": "0.0.6"
+        "debug": "^2.2.0",
+        "nan": "^2.3.3",
+        "typedarray-to-buffer": "^3.1.2",
+        "yaeti": "^0.0.6"
       }
     },
     "xhr": {
@@ -266,10 +266,10 @@
       "resolved": "http://registry.npm.taobao.org/xhr/download/xhr-2.4.0.tgz",
       "integrity": "sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=",
       "requires": {
-        "global": "4.3.2",
-        "is-function": "1.0.1",
-        "parse-headers": "2.0.1",
-        "xtend": "4.0.1"
+        "global": "~4.3.0",
+        "is-function": "^1.0.1",
+        "parse-headers": "^2.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "xtend": {
@@ -287,7 +287,7 @@
       "resolved": "https://registry.npm.taobao.org/ztree/download/ztree-3.5.24.tgz",
       "integrity": "sha1-tj/lKYH98sMpZ1z9J3Lw0UdSH/E=",
       "requires": {
-        "jquery": "3.2.1"
+        "jquery": ">=1.4.4"
       }
     },
     "zui": {

VisualInspection/qzd/js/task/check.js

@@ -606,7 +606,7 @@ function genPicstr(imgSrc) {
 
     var pic = '<div class="img_item" style="width:100px;height:90px;float:left;">' +
         '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>' +
-        (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+        (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
         '<img class="pic-class img-thumbnail" path="' + imgSrc + '" style="width:100px;height:70px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 20px;left: 40px;color: white;"></i>') +
         '</a>' +
         '</div>';

VisualInspection/qzd/js/task/new.js

@@ -176,7 +176,7 @@ function queryTask() {
                 }
                 $(this).uploader({
                     autoUpload: true, // 当选择文件后立即自动进行上传操作
-                    url: base_image_server_url + 'fileServer/file/upload', // 文件上传提交地址
+                    url: base_image_server_url + 'fileServer/file/upload?type=1', // 文件上传提交地址
                     chunk_size: 0,
                     filters: {
                         mime_types: [{

VisualInspection/qzd/view/task/taskDetail.html

@@ -284,7 +284,7 @@
 
                 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>' +
-                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
                     '<img class="pic-class img-thumbnail" style="width:200px;height:150px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 40px;left:80px;color: white;"></i>') +
                     '</a>' +
                     '</div>';

VisualInspection/view/main.html

@@ -74,6 +74,14 @@
 
         </div>
     </div>
+    
+    <div style="position:absolute;width:100%;height:100%;z-index: 100;background:rgba(0,0,0,0.5);top:0;left:0;display:none" id="videodiv">
+        <div style="position:absolute;left:50%;top:50%; transform: translate(-50%, -50%);width:800px;height:600px;" >
+     <button id="videoClose" type="button" class="close" data-dismiss="modal" ><span aria-hidden="true" >×</span><span class="sr-only">关闭</span></button>
+       <div id="videoDiv" class="video tab-pane active" style="width:100%;height:100%;"></div>
+        </div>
+    </div>
+    <script type="text/javascript" src="/js/lib/ckplayer/ckplayer/ckplayer.js"></script>
 
     <script src="/js/main.js"></script>
     <script>

VisualInspection/view/mytask/taskDetail.html

@@ -287,7 +287,7 @@
 
                 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>' +
-                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+                    (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="videoCkplayer(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
                     '<img class="pic-class img-thumbnail" style="width:200px;height:150px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 40px;left:80px;color: white;"></i>') +
                     '</a>' +
                     '</div>';

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

@@ -774,7 +774,7 @@
             resultType="com.xintong.visualinspection.bean.StatisticsBean">
         SELECT t.name AS check_task_name , t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS
         score , ci.name AS name,ci.parent_name, cs.pics ,t.checkman AS checkman_id,
-        cs.checked_person AS user_id ,t.checked_dept AS dept_id
+        t.checked_person AS user_id ,t.checked_dept AS dept_id
         <if test="queryType!=null and queryType==1">
             ,cst.update_time,t.id as task_id
         </if>

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

@@ -1888,6 +1888,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 	@Override
 	public void getCheckInfo(StatisticsBean obj, HttpServletRequest req, HttpServletResponse resp) {
+		//obj.setScore_flag(1);
 		List<StatisticsBean> list = statisticsDao.selectOneCheckedDetailInfo(obj);
 		if (obj.getQueryType() == 1) {
 			int seq = 1;
@@ -1923,8 +1924,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 //		TaskAndScore temp = new TaskAndScore();
 //		Calendar cal = Calendar.getInstance();
 //		Date d = DateUtil.strParseDate(month, "yyyy/MM");
-//		cal.setTime(d);
-//		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), 25, 23, 0, 0);
+//		cal.setTime(d);//		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), 25, 23, 0, 0);
 //		temp.setEnd_time(cal.getTime());
 //		cal.add(Calendar.MONTH, -1);
 //		temp.setStart_time(cal.getTime());
@@ -2828,7 +2828,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 					deptStatistics1.sort(new Comparator<DeptStatistic>() {
 						@Override
 						public int compare(DeptStatistic o1, DeptStatistic o2) {
-							return o1.getTotal_integral() > o2.getTotal_integral() ? -1 : 1;
+							if(o1.getTotal_integral() == o2.getTotal_integral()){
+								return 0;
+							}else {
+								return o1.getTotal_integral() > o2.getTotal_integral() ? -1 : 1;
+							}
 						}
 					});
 					for (int i = 0; i < deptStatistics1.size(); i++) {

VisualInspection_server/src/main/resources/application.properties

@@ -1,16 +1,16 @@
-server.port=8089
+server.port=8086
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://192.168.45.164:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://192.168.45.158:3306/visual_test?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visual_test?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://127.0.0.1:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://127.0.0.1:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -20,13 +20,14 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://192.168.45.164:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url = jdbc:mysql://192.168.45.158:3306/visual_test?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url = jdbc:mysql://10.112.0.199:3306/visual_test?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url = jdbc:mysql://127.0.0.1:7004/visual_test?useUnicode=true&characterEncoding=utf-8
-cluster.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
-#cluster.datasource.url = jdbc:mysql://127.0.0.1:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://200.200.19.126:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+cluster.datasource.url = jdbc:mysql://127.0.0.1:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -79,8 +80,8 @@ spring.redis.port=6379
 #spring.redis.port=9004
 #spring.redis.port=7003
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-#spring.redis.password=xintong
-spring.redis.password=123
+spring.redis.password=xintong
+#spring.redis.password=123
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=8  
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09

Visuallnspection_fjq/.idea/workspace.xml

@@ -27,8 +27,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -50,7 +48,9 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -131,11 +131,12 @@
       <workItem from="1554708635186" duration="23000" />
       <workItem from="1560920693097" duration="15000" />
       <workItem from="1567495032555" duration="49000" />
+      <workItem from="1593566371536" duration="16000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="911000" />
+    <option name="totallyTimeSpent" value="927000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -149,10 +150,10 @@
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32905984" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32827586" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24865952" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24804688" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/StatisticsServiceImpl.java

@@ -63,7 +63,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
             registry = "${dubbo.registry.address}")
     private CommonService commonService;
 
-    public static Double check_num = 10.0;
+    public static Double check_num = 2.0;
 
     @Override
     public List<FwqStatisticsBean> getOperationInfo(FwqStatisticsBean obj) {

Visuallnspection_fjq/visuallnspectioninteface/visuallnspectioninteface.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet __external-system-id="Maven" type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+</module>