Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection_server/visual/visual.log

VisualInspection/js/config.js

@@ -26,7 +26,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {
-        return "http://10.112.0.199:8089/"
+        // return "http://10.112.0.199:8089/"
+        return "http://10.112.0.199:7001/"
     }
 }
 
@@ -43,7 +44,8 @@ function getExcelServeraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:9000/"
     } else {
-        return "http://10.112.0.199:9000/"
+        // return "http://10.112.0.199:9000/"
+        return "http://10.112.0.199:7010/"
     }
 }
 
@@ -60,7 +62,8 @@ function getQzdExcelServeraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:9001/"
     } else {
-        return "http://10.112.0.199:9001/"
+        // return "http://10.112.0.199:9001/"
+        return "http://10.112.0.199:7011/"
     }
 }
 
@@ -78,7 +81,8 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8080/"
     } else {
-        return "http://10.112.0.199/"
+        // return "http://10.112.0.199/"
+        return "http://10.112.0.199:7000/"
     }
 }
 

VisualInspection/qzd/js/task/check.js

@@ -1,6 +1,6 @@
 var videoPlayer;
 var isfullscreen = false;
-var videoids;
+var videoid;
 
 function dbclick() {
 
@@ -34,8 +34,8 @@ function videorecordstart(type) {
 
         //开始截取视屏
         post_common_service_nohead(base_image_server_url + 'fileServer/file/videocut', {
-            "targetfilename": videoids,
-            "filename": videoids.split(".")[0],
+            "targetfilename": videoid,
+            "filename": videoid.split(".")[0],
             "startTime": startTimec,
             "endtime": endTimec
         }, function(data) {
@@ -46,8 +46,8 @@ function videorecordstart(type) {
 
         //开始截取视屏
         post_common_service_nohead(base_image_server_url + 'fileServer/file/videopiccut', {
-            "targetfilename": videoids,
-            "filename": videoids.split(".")[0],
+            "targetfilename": videoid,
+            "filename": videoid.split(".")[0],
             "startTime": currentTime,
         }, function(data) {
             addPic(data.path)
@@ -98,14 +98,33 @@ function initCheck() {
         //TODO 获取分数
         queryCheckScores();
 
-        videoids = $.checkTask.recordVideos;
+        videos = $.checkTask.recordVideos;
 
 
+
+        if (videos.split(",").length > 0) {
+            var vlist = videos.split(",");
+
+            var htmlo = "";
+            for (var v in vlist) {
+
+                var vv = vlist[v];
+                console.log(vv.split("/")[0]);
+                var o = "<option val='" + vv + "' " + (v == 0 ? "selected" : "") + " >" + vv.split("/")[0] + "</option>"
+                htmlo += o;
+            }
+
+            $("#videoslist").html(htmlo);
+        }
+
+        videoid = videos.split(",")[0]
+
         var videoObject = {
             container: '.video', //“#”代表容器的ID，“.”或“”代表容器的class
             variable: 'player', //该属性必需设置，值等于下面的new chplayer()的对象
             //poster: 'pic/wdm.jpg', //封面图片
-            video: base_image_server_url + 'file/' + videoids //视频地址
+            autoplay: true,
+            video: base_image_server_url + 'file/' + videoid //视频地址
         };
         videoPlayer = new ckplayer(videoObject);
         videoPlayer.addListener('time', timeHandler);
@@ -115,6 +134,19 @@ function initCheck() {
 
 }
 
+function onvideoselect(obj) {
+    videoid = (obj.value);
+    var videoObject = {
+        container: '.video', //“#”代表容器的ID，“.”或“”代表容器的class
+        variable: 'player', //该属性必需设置，值等于下面的new chplayer()的对象
+        //poster: 'pic/wdm.jpg', //封面图片
+        autoplay: true,
+        video: base_image_server_url + 'file/' + videoid //视频地址
+    };
+    videoPlayer = new ckplayer(videoObject);
+    videoPlayer.addListener('time', timeHandler);
+}
+
 function setfastorslow(type, speed) {
     if (type == 0) {
         $("#fast_info").html("");
@@ -180,27 +212,27 @@ function getAreaCheckCount() {
     });
     //var html = '';
     var userids = $.checkTask.checked_users.split(",");
-    var usernames =  $.checkTask.checked_users_name.split(",");
+    var usernames = $.checkTask.checked_users_name.split(",");
     var param = {
-                "period_id": $.checkTask.period_id,
-                "checked_users":$.checkTask.checked_users
-            };
-                            var url = base_server_url + "/q/task/getTasks/0/0";
-                            ajaxPost(url, param, function(response) {
-                                for(var i in userids){
-                                    console.log(response);
-                                        var html ='<label id="'+userids[i]+'"></label>'+ usernames[i]+'(次数:'+
-                                                      '<a href="javascript:void(0)" onclick="showCheckDetailCount(\''+userids[i]+'\')"><span class="label label-primary" id="">'+response[i].length+'</span></a>)';
-                                                      $("#checked_area").append(html);
-                            
-                                }
-                             }, function(error) {
-                                 if (fail)
-                                     fail("网络错误");
-                                 else
-                                     console.log("网络错误");
-                             });
-                            
+        "period_id": $.checkTask.period_id,
+        "checked_users": $.checkTask.checked_users
+    };
+    var url = base_server_url + "/q/task/getTasks/0/0";
+    ajaxPost(url, param, function(response) {
+        for (var i in userids) {
+            // console.log(response);
+            var html = '<label id="' + userids[i] + '"></label>' + usernames[i] + '(次数:' +
+                '<a href="javascript:void(0)" onclick="showCheckDetailCount(\'' + userids[i] + '\')"><span class="label label-primary" id="">' + response[i].length + '</span></a>)';
+            $("#checked_area").append(html);
+
+        }
+    }, function(error) {
+        if (fail)
+            fail("网络错误");
+        else
+            console.log("网络错误");
+    });
+
 }
 
 
@@ -344,17 +376,17 @@ function showEditCheckScore(id) {
     }, ['350px', '550px'], '#score-detail-div', 'r');
     var list = new Array();
     var userids = $.checkTask.checked_users.split(",");
-    var usernames =  $.checkTask.checked_users_name.split(",");
+    var usernames = $.checkTask.checked_users_name.split(",");
     console.log(rowData);
     var optStr = '';
-        for (var i in userids) {
-             if (userids[i] == rowData.checked_area)
-                 optStr += '<option value="' + userids[i] + '" selected="selected">' + usernames[i] + '</option>';
-             else
-                optStr += '<option value="' + userids[i] + '">' + usernames[i] + '</option>';
-        }
-        $("#check_checked_person_select").html('');
-        $("#check_checked_person_select").html(optStr);
+    for (var i in userids) {
+        if (userids[i] == rowData.checked_area)
+            optStr += '<option value="' + userids[i] + '" selected="selected">' + usernames[i] + '</option>';
+        else
+            optStr += '<option value="' + userids[i] + '">' + usernames[i] + '</option>';
+    }
+    $("#check_checked_person_select").html('');
+    $("#check_checked_person_select").html(optStr);
     $("#score_id_text").val(rowData.id);
     $("#check_item_text").val(rowData.content);
     $("#check_score_text").val(rowData.check_item_score);

VisualInspection/qzd/view/task/check.html

@@ -44,7 +44,9 @@
                                         <span id="ex1_span" style="position: absolute;left: 25px;">23:00:00</span>
                                     </div> -->
                                     <div class="row" style="padding:10px 5px 0px 5px;text-align:center;margin:0px">
-                                        <div class="col-md-4 " style="padding-left:0">
+                                        <div class="col-md-6 " style="padding-left:0;text-align: left">
+
+                                            <label>视屏列表：</label> <select id="videoslist" onchange="onvideoselect(this)"></select>
                                             <!-- <div class="input-group" style="padding-left:0">
                                                 <input type="text" id="video_pos" style="height:42px" class="form-control" placeholder="时间偏移值">
                                                 <span class="input-group-btn">

VisualInspection_server/src/main/resources/application.properties

@@ -4,8 +4,8 @@ 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://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://10.112.0.199:7002/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://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -14,8 +14,8 @@ 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://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
-#cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/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
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -57,12 +57,12 @@ spring.datasource.useGlobalDataSourceStat=true
 spring.redis.database=0  
 # Redis\u670D\u52A1\u5668\u5730\u5740
 #spring.redis.host=10.112.0.199
-spring.redis.host=xt.wenhq.top
+spring.redis.host=127.0.0.1
 #spring.redis.host=192.168.45.158
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-#spring.redis.port=6379
+spring.redis.port=6379
 
-spring.redis.port=8284
+#spring.redis.port=8284
 #spring.redis.port=9004
 #spring.redis.port=7003
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09

Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Aug 13 09:46:07 CST 2018
+#Wed Aug 15 09:53:20 CST 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface