MSI\liwei %!s(int64=7) %!d(string=hai) anos
pai
achega
25685006ec
Modificáronse 2 ficheiros con 44 adicións e 14 borrados
  1. 8 8
      VisualInspection/js/config.js
  2. 36 6
      VisualInspection/qzd/js/task/check.js

+ 8 - 8
VisualInspection/js/config.js

@@ -19,8 +19,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         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://server_release_yanhai.jsxt.jsjtyxt.com/"
+        return "http://localhost:8089/"
     } 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) {
@@ -38,8 +38,8 @@ function getExcelServeraddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://server_fwq_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:9000/"
+       // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
+        return "http://localhost:9000/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:9000/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
@@ -57,8 +57,8 @@ function getQzdExcelServeraddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://server_fwq_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:9001/"
+       // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
+        return "http://localhost:9001/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:9001/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
@@ -78,7 +78,7 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:7000/"
         // return "http://file_release_yanhai.jsxt.jsjtyxt.com:8283/";
-        // return "http://localhost:8081/";
+        return "http://localhost:8081/";
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
@@ -95,7 +95,7 @@ function getTaskaddr() {
         return "http://task_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:8099/"
-        // return "http://localhost:8099/"
+         return "http://localhost:8099/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8099/"
     } else {

+ 36 - 6
VisualInspection/qzd/js/task/check.js

@@ -102,8 +102,7 @@ function initCheck() {
         queryCheckScores();
 
         videos = $.checkTask.recordVideos;
-
-
+        if(videos != '' && videos != null ){
 
         if (videos.split(",").length > 0) {
             var vlist = videos.split(",");
@@ -127,15 +126,41 @@ function initCheck() {
             variable: 'player', //该属性必需设置,值等于下面的new chplayer()的对象
             //poster: 'pic/wdm.jpg', //封面图片
             autoplay: true,
-            video: base_image_server_url + videoid //视频地址
+            // video: base_image_server_url + videoid //视频地址
+            video: "file:///H://N3J4803_00030220180708095248_1289.MP4"   //视频地址
         };
         videoPlayer = new ckplayer(videoObject);
-        videoPlayer.addListener('time', timeHandler);
+       // videoPlayer.addListener('time', timeHandler);
+    }else {
+           $(".nav-secondary").hide();
+    }
+    console.log($.checkTask);
+     if($.checkTask.pics != '' && $.checkTask.pics != null){
+            var recordPics = $.checkTask.pics.split(",");
+            for(var i in recordPics){
+                if(i == 0){
+                    var html = '<div class="item active"  style="width:100%;height:100%">'+
+                    '<img  style="width:100%;height:100%" alt="First slide" src="'+recordPics[i]+'" >'+
+                    '</div>';
+                }else{
+                  var html = '<div class="item"  style="width:100%;height:100%">'+
+                             '<img  style="width:100%;height:100%" alt="First slide" src="'+recordPics[i]+'" >'+
+                             '</div>';
+            }
+                  $('#imgCarousel').append(html);
+                //   $('#videoButton').hide();
+                //   $('#video_btn_start').hide();
+                 // $("#picController").click();
+            }
+
+        }else{
+            $(".nav-secondary").hide(); 
+        }
 
     }
 
+    }
 
-}
 
 function onvideoselect(obj) {
     videoid = (obj.value);
@@ -983,4 +1008,9 @@ function addTag(text, tagDiv) {
 //             $("#top_reason_div").html(str);
 //         }
 //     });
-// }
+// }
+
+function changeButton(){
+    $('#videoButton').hide();
+    $('#video_btn_start').hide();
+}