和视频合并接口

VisualInspection/js/assess_management/assess_item.js

@@ -255,6 +255,7 @@ function delete_check_item(id ){
              zdataItem["pId"] = null;
              zdataItem["score"] = m.score ;
              zdataItem["name"] = m.name;
+             zdataItem["open"] = true;
              zdataItem["children"] = addobj(m);
              zdata.push(zdataItem);
          }
@@ -275,6 +276,7 @@ function delete_check_item(id ){
              zdataItem["score"] = m.score ;
              zdataItem["icon"] = "";
              zdataItem["name"] = m.name;
+             zdataItem["open"] = true;
              zdataItem["children"] = addobj(m);
              zdata.push(zdataItem);
          }

VisualInspection/js/util/video.js

@@ -0,0 +1,25 @@
+function setProgress(percent){
+    $(".progress-bar").css('width',percent);
+}
+
+function setVideoList(videos){
+    var videoArr;
+    if(videos){
+        videoArr = videos.split("|");
+        var selectStr="";
+        for(var i in videoArr){
+            if(i==0)
+                selectStr += '<option value="'+videoArr[i]+'" selected="selected">视频'+videoArr[i]+'</option>'
+            else
+                selectStr += '<option value="'+videoArr[i]+'">视频'+videoArr[i]+'</option>';
+        }
+    }
+    $('#video_list').html(selectStr);
+}
+
+function doAction(func){
+    event = document.createEvent('MessageEvent');
+    var origin = window.location.protocol + '//' + window.location.host;
+    event.initMessageEvent (func, true, true, '', origin, 1234, window, null);
+    document.dispatchEvent (event);
+}

VisualInspection/view/common/commonscriptlink.html

@@ -18,7 +18,7 @@
 <script src="/js/util/util.js"></script>
 <script src="/js/util/service.js"></script>
 <script src="/js/constant/constant.js"></script>
-
+<script src="/js/util/video.js"></script>
 
 <script type="text/javascript">
     $(document).ready(function() {

VisualInspection/view/mytask/check.html

@@ -35,13 +35,14 @@
                     <i class="icon icon-list"></i>
                     <span class="title">面板标题</span>
                     </div>-->
-                    <div class="panel-body">
+                    <select class="form-control" id="video_list" style="position:absolute;left:300px;top:10px;width:200px;"></select>
+                    <div class="panel-body" style="padding:5px;">
                         <ul class="nav nav-secondary">
                             <li class="active"><a data-tab href="#tabContent1">收费亭</a></li>
                             <li><a data-tab href="#tabContent2">车道</a></li>
                             <li><a data-tab href="#tabContent3">广场</a></li>
                         </ul>
-                        <div class="tab-content" style="height:330px;">
+                        <div class="tab-content" style="height:350px;">
                             <div class="tab-pane active" id="tabContent1" class="col-sm-12">
                             </div>
                             <div class="tab-pane" id="tabContent2" class="col-sm-12">
@@ -49,19 +50,25 @@
                             <div class="tab-pane" id="tabContent3" class="col-sm-12">
                             </div>
                         </div>
+                        <div class="row" style="padding:5px;margin-top:5px;text-align:center">
+                            <div class="progress">
+                                <div class="progress-bar" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
+                                    <span class="sr-only">40% Complete (success)</span>
+                                </div>
+                            </div>
+                        </div>
                         <div class="row" style="margin-top:5px;text-align:center">
                             <div class="btn-group">
-                                <button type="button" class="btn btn-info">播放</button>
-                                <button type="button" class="btn btn-primary">停止</button>
-                                <button type="button" class="btn btn-warning">快进</button>
-                                <button type="button" class="btn btn-danger">快退</button>
-                                <button type="button" class="btn btn-success">抓图</button>
+                                <button type="button" class="btn btn-info" onclick="doAction('start')">播放</button>
+                                <button type="button" class="btn btn-primary" onclick="doAction('stop')">停止</button>
+                                <button type="button" class="btn btn-warning" onclick="doAction('fast')">快进</button>
+                                <button type="button" class="btn btn-danger" onclick="doAction('slow')">快退</button>
+                                <button type="button" class="btn btn-success" onclick="doAction('screenshot')">抓图</button>
                             </div>
                         </div>
                         <hr>
                         <div class="row">
                             <div id="img_container" class="cards cards-borderless col-sm-11">
-                            
                             </div>
                             <div class="col-sm-1">
                                 <br>

VisualInspection/view/user/login.html

@@ -13,7 +13,7 @@
 
     <div id="main" class="container-fluid main">
         <div class="row">
-            <div class="col-md-5"></div>
+            <div class="col-md-6"></div>
             <div class="col-md-4">
                 <div class="panel">
                     <div class="panel-heading">
@@ -38,7 +38,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-3"></div>
+            <div class="col-md-2"></div>
 
         </div>