bug

VisualInspection/qzd/js/task/check.js

@@ -141,11 +141,11 @@ function initCheck() {
             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]+'" >'+
+                    '<img id="imgone" style="width:100%;height:100%" alt="First slide" src="'+base_image_server_url+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]+'" >'+
+                             '<img  style="width:100%;height:100%" alt="First slide" src="'+base_image_server_url+recordPics[i]+'" >'+
                              '</div>';
             }
                   $('#imgCarousel').append(html);
@@ -1012,7 +1012,19 @@ function addTag(text, tagDiv) {
 //     });
 // }
 
-function changeButton(){
-    $('#videoButton').hide();
-    $('#video_btn_start').hide();
+function changeButton(obj){
+     if(obj == 1){
+           $("#buttonVideo").show();
+           $("#videoButton").show();
+           $("#buttonPics").hide();
+     }else if(obj == 2){
+        $("#buttonVideo").hide();
+        $("#videoButton").hide();
+        $("#buttonPics").show();
+     }
+}
+
+function addPics(){
+    var imgUrl = $('.active').find("img").attr("src");
+    addPic(imgUrl);
 }

VisualInspection/qzd/js/task/new.js

@@ -168,7 +168,8 @@ function queryTask() {
                             file_src += datas.result_data.path;
                         }
                         var data = {
-                            "id": id
+                            "id": id,
+                            "isComplete":1
                         };
                         if(file.type.indexOf('image') === 0) {
                             data.pics = file_src;

VisualInspection/qzd/view/task/check.html

@@ -29,8 +29,8 @@
 
                             <div class="panel-body" style="padding:0 0 5px 0">
                                 <ul class="nav nav-secondary" id="tabController">
-                                    <li class="active"><a data-tab href="#videoDiv" onclick="changeButton()">视频</a></li>
-                                    <li><a id="picController" data-tab href="#picDiv" onclick="changeButton()">图片</a></li>
+                                    <li class="active"><a id="videoController" data-tab href="#videoDiv" onclick="changeButton(1)">视频</a></li>
+                                    <li><a id="picController" data-tab href="#picDiv" onclick="changeButton(2)">图片</a></li>
                                   </ul>                                  
                                 <div id="video_content">
                                     <div class="tab-content" id="tabcontent" style="height:400px;text-align: center;background:black;" ondblclick="dbclick()">
@@ -78,7 +78,7 @@
                                              </span> -->
                                             <!-- </div> -->
                                         </div>
-                                        <div class="btn-group1" style="float:right;">
+                                        <div class="btn-group1" style="float:right;" id="buttonVideo">
                                             <!-- <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('start')"><i class="icon icon-play-circle icon-2x"></i></button>
                                             <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('stop')"><i class="icon icon-pause icon-2x"></i></button>
                                             <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('fast')"><i class="icon icon-forward icon-2x"></i><span id="fast_info"></span></button>
@@ -89,6 +89,17 @@
 
 
                                         </div>
+                                        <div class="btn-group1" style="float:right;display: none" id="buttonPics">
+                                            <!-- <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('start')"><i class="icon icon-play-circle icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('stop')"><i class="icon icon-pause icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('fast')"><i class="icon icon-forward icon-2x"></i><span id="fast_info"></span></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('slow')"><span id="slow_info"></span><i class="icon icon-backward icon-2x"></i></button> -->
+                                            <!-- <button type="button" class="btn btn-info1 " style="width:41px;height:41px" id="video_btn_start" onclick="videorecordstart('video_start')"><img id="video_btn_start_img" style="width:30px" src="/images/video.png"></img></button>
+                                            <button type="button" class="btn btn-info1 hidden" style="width:41px;height:41px" id="video_btn_stop" onclick="videorecordstart('video_stop')"><i class="icon icon-stop icon-2x"></i></button> -->
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" id="pic_button" onclick="addPics()"><i class="icon icon-camera icon-2x"></i></button>
+
+
+                                        </div>
 
                                     </div>
                                     <!--<hr>-->