minitiger 8 лет назад
Родитель
Сommit
c8b118d290

+ 1 - 1
VisualInspection/js/mytask/check.js

@@ -53,7 +53,7 @@ function initCheck() {
         var videos = $.checkTask.video_id.split(','); 
         if(videos[0]){
             curVideo = videos[0]; 
-             queryVideoList();
+            queryVideoList();
          }else{
               callFunc("showvideoview", "false");
             layer.msg('该处暂无视屏!', {

+ 2 - 1
VisualInspection/js/util/const.js

@@ -59,4 +59,5 @@ var ROLE_JICHA_ADMIN="ROLE_JICHA_ADMIN";
 var ROLE_STATION_ADMIN="ROLE_STATION_ADMIN";
 var ROLE_STATION="ROLE_STATION";
 var ROLE_JICHA="ROLE_JICHA";
-var ROLE_MANAGER="ROLE_MANAGER";
+var ROLE_MANAGER="ROLE_MANAGER";
+var ROLE_STATION_AGENT="ROLE_STATION_AGENT";

+ 22 - 7
VisualInspection/view/mytask/check.html

@@ -40,9 +40,10 @@
 
                             <div class="panel-body" style="padding:5px;">
                                 <ul class="nav nav-secondary">
-                                    <li class="active"><a data-tab href="#tabContent1" bbb="0">收费亭</a></li>
-                                    <li><a data-tab href="#tabContent2" bbb="1">车道</a></li>
-                                    <li><a data-tab href="#tabContent3" bbb="2">广场</a></li>
+                                    <li class="tab_lane" class="active"><a data-tab href="#tabContent1" bbb="0">收费亭</a></li>
+                                    <li class="tab_lane"><a data-tab href="#tabContent2" bbb="1">车道</a></li>
+                                    <li class="tab_lane"><a data-tab href="#tabContent3" bbb="2">广场</a></li>
+                                    <li class="tab_not_lane"><a data-tab href="#tabContent4" bbb="3">值机室</a></li>
                                 </ul>
                                 <div class="tab-content" id="tabcontent" style="height:400px;text-align: center;background:rgba(ff,ff,ff,0.0);">
                                     <p style="padding-top:100px;font-size:20px">加载中...</p>
@@ -180,17 +181,31 @@
 <script>
     var curVideo;
     $(document).ready(function () {
+        if($.checkTask.checked_location_type==1){
+            $("li.tab_lane").hide();
+            $("li.tab_not_lane").show();
+            $("li.tab_not_lane").addClass("active");
+        }else{
+            $("li.tab_lane").show();
+            $("li.tab_not_lane").hide();
+        }
         initCheck();
 
-
         $('[data-tab]').on('shown.zui.tab', function (e) {
             // console.log('当前被激活的标签页', $(e.target).attr('bbb'));
             // console.log('上一个标签页', e.relatedTarget);
             var i = $(e.target).attr('bbb');
-            var videos = $.checkTask.video_id.split(',');
+            var showVideo;
+            if(i==3) {
+                showVideo = $.checkTask.video_id;
+            }else {
+                var videos = $.checkTask.video_id.split(',');
+                showVideo = videos[i];
+            }
 
-            if (videos[i] != "" && videos[i] && typeof (videos[i]) != "undefined") {
-                curVideo = videos[i];
+            alert(showVideo);
+            if (showVideo != "" && showVideo && showVideo != "undefined") {
+                curVideo = showVideo;
                 queryVideoList();
             } else {
                 callFunc("showvideoview", "false");

+ 4 - 2
VisualInspection/view/mytask/taskDetail.html

@@ -126,6 +126,8 @@
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_11",["#assignBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_STATION_ADMIN+"_5",["#confirmBtn","#appealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_STATION_ADMIN+"_15",["#confirmAppealBtn"]);
+        $.zui.store.set("task_detail_btn_"+ROLE_STATION_AGENT+"_5",["#confirmBtn","#appealBtn"]);
+        $.zui.store.set("task_detail_btn_"+ROLE_STATION_AGENT+"_15",["#confirmAppealBtn"]);
     }
     function checkAuth(){
         initBtns();
@@ -252,7 +254,7 @@
             "check_status":4
         }
         no_return_common_service("/task/taskEnd/",param,function(data){
-             layer.msg(data, {
+             layer.msg("提交成功", {
                 time: 2000//20s后自动关闭
              });
             changePage("/view/mytask/task_list.html?status=2");
@@ -266,7 +268,7 @@
             "check_status":14
         }
         no_return_common_service("/task/update/",param,function(data){
-             layer.msg(data, {
+             layer.msg("提交成功", {
                 time: 2000//20s后自动关闭
              });
             changePage("/view/mytask/task_list.html?status=13");