MSI\liwei пре 7 година
родитељ
комит
7e7c3a4497
1 измењених фајлова са 30 додато и 6 уклоњено
  1. 30 6
      VisualInspection/qzd/view/task/check.html

+ 30 - 6
VisualInspection/qzd/view/task/check.html

@@ -28,15 +28,39 @@
                         <div class="panel" data-id="1">
 
                             <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>
+                                  </ul>                                  
                                 <div id="video_content">
                                     <div class="tab-content" id="tabcontent" style="height:400px;text-align: center;background:black;" ondblclick="dbclick()">
-                                        <div class="video" style="width:100%;height:100%;"></div>
+                                        <div id="videoDiv" class="video tab-pane active" style="width:100%;height:100%;"></div>
                                         <!-- <video id="example_video_1" class="video-js vjs-default-skin vjs-big-play-centered" preload="auto"> -->
                                         <!-- <source src="http://yun.it7090.com/video/XHLaunchAd/video01.mp4" type='video/mp4' /> -->
                                         <!-- </video> -->
+                                        <div id="picDiv" class="tab-pane" style="width:100%;height:100%;">
+                                            <div id="myNiceCarousel" class="carousel slide" data-ride="carousel" style="width:100%;height:100%">
+                                                <div id="imgCarousel" class="carousel-inner"  style="width:100%;height:100%">
+                                                  <!-- <div class="item active"  style="width:100%;height:100%">
+                                                    <img  style="width:100%;height:100%" alt="First slide" src="http://zui.sexy/docs/img/slide1.jpg" >
+                                                  </div>
+                                                  <div class="item"  style="width:100%;height:100%">
+                                                    <img  style="width:100%;height:100%" alt="Second slide" src="http://zui.sexy/docs/img/slide2.jpg">
+                                                  </div>
+                                                  <div class="item"  style="width:100%;height:100%">
+                                                    <img  style="width:100%;height:100%" alt="Third slide" src="http://zui.sexy/docs/img/slide3.jpg">
+                                                  </div> -->
+                                                </div>
+                                              
+                                                <!-- 项目切换按钮 -->
+                                                <a class="left carousel-control" href="#myNiceCarousel" data-slide="prev">
+                                                  <span class="icon icon-chevron-left"></span>
+                                                </a>
+                                                <a class="right carousel-control" href="#myNiceCarousel" data-slide="next">
+                                                  <span class="icon icon-chevron-right"></span>
+                                                </a>
+                                              </div>
+                                        </div>
                                     </div>
                                     <!-- <div class="row" class="col-md-12" style="padding:5px 10px 25px 10px;text-align:center;margin:0px">
                                         <input id="ex1" class="col-md-12" type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="0" />
@@ -44,7 +68,7 @@
                                         <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-6 " style="padding-left:0;text-align: left">
+                                        <div id="videoButton" 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">
@@ -61,7 +85,7 @@
                                             <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" onclick="videorecordstart('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" id="pic_button" onclick="videorecordstart('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
 
 
                                         </div>