修改稽查页面

VisualInspection/js/mytask/check.js

@@ -3,18 +3,6 @@ function initCheck() {
     $("#ex1").on("slideStop", function(slideEvt) {
         setVideoProcess(slideEvt.value);
     });
-    // setProcessValue(600);
-    // $("#ex1").on("click", function(slideEvt) {
-    //     setVideoProcess(slideEvt.value);
-    // });
-
-    // $("#ex1").on("slideStop", function(slideEvt) {
-    //     setProcessValue(slideEvt.value);
-    // });
-    setProcessValue(300);
-    // setCurrentProcessValue(50);
-
-    // setCurrentProcessValue(60);
 
     event = document.createEvent('MessageEvent');
     var origin = window.location.protocol + '//' + window.location.host;
@@ -49,6 +37,7 @@ function initCheck() {
         format: "yyyy-mm-dd"
     });
     if ($.checkTask) {
+        initCheckAppealBtns();
         setFeSelect("#fsList", $.checkTask.checked_dept);
         setLaneSelect("#lane", $.checkTask.checked_location);
         get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function (data) {
@@ -58,7 +47,6 @@ function initCheck() {
         queryScores();
         //查询录像播放列表
         queryVideoList();
-        initBtns();
     }
      $("select#video_list").change(function(){
         playVideo($(this).val());
@@ -68,7 +56,7 @@ function initCheck() {
 function initInfo() {
 
 }
-function initBtns(){
+function initCheckAppealBtns(){
     if($.checkTask.appeal) {
         $("#btn_appeal_task").show();
         $("#btn_task").hide();
@@ -203,6 +191,14 @@ function genPicstr(src){
                 + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + src + '" alt="">'
                 + '</a>'
                 + '</div>';
+    if(ISCLIENT) {
+        pic = '<div class="img_item" style="width:100px;height:90px;float:left;">'
+                + '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
+                + '<a class="card lightbox-toggle" onclick="'+src +'" href="javascript:void(0)" style="position:absolute">'
+                + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + src + '" alt="">'
+                + '</a>'
+                + '</div>';
+    }
     return pic;
 }
 
@@ -230,8 +226,7 @@ function showChangeUser() {
             if (data[i].pic) pic = base_image_server_url+data[i].pic;
             str = '<div style="width:100px;float:left;margin:5px;">'
                 + '<a class="card" href="javascript:void(0)" onclick="changePerson(\'' + data[i].id + '\')">'
-                + '<img src="' + pic + '" alt="" style="height:100px">'
-                // +   '<a href="#" onclick="changePerson(\''+name+'\')">'+name+'<a href="'+data[i].pic+'class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a></a>'
+                + '<img src="' + pic + '" alt="" style="height:100px;width:100px;">'
                 + '<div class="card-heading"><strong>' + name + '</strong></div>'
                 + '</a>'
                 + '</div>';
@@ -255,13 +250,28 @@ function changePerson(id) {
         alert(error);
     });  
 }
-
+function resetUserImgInfo() {
+    $("#user_img_container").empty();
+    var str = '<a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle">'
+                +'<img src="../../images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>'
+                 +   '<label id="checked_person"></label>';
+    $("#user_img_container").html(str);
+}
 function changePersonContent(data) {
+    resetUserImgInfo();
     var name = data.truename;
     if (data.workno) name = data.workno + " " + data.truename;
     $("#checked_person").html(name);
-    $("#person_img").attr("href", data.pic);
-    $("#person_img > img").attr("src", data.pic);
+    var imgSrc = base_image_server_url+data.pic;
+    if(ISCLIENT) {
+        $("#person_img").attr("href", "javascript:void(0)");
+        $("#person_img").click(function(){
+            showClientImg(imgSrc);
+        });
+    }else {       
+        $("#person_img").attr("href", imgSrc);
+    }
+    $("#person_img > img").attr("src", imgSrc);
     $('a.lightbox-toggle').lightbox();
 }
 var scoreLayer;
@@ -402,6 +412,7 @@ function zTreeOnClick(event, treeId, treeNode) {
     };
     no_return_common_service("/score/add", param, function (data) {
         if (scoreLayer) layer.close(scoreLayer);
+        clearAllImg();
         //查询评分情况
         queryScores();
         layer.msg(data, {

VisualInspection/js/user/login.js

@@ -23,9 +23,9 @@ $(document).ready(function() {
             $.zui.store.remove("currentpage");
 
             //获取域名
-            host = "http://"+window.location.host+"/";
-            base_image_server_url = host;
-            base_ui_url = host;
+            // host = "http://"+window.location.host+"/";
+            // base_image_server_url = host;
+            // base_ui_url = host;
             window.location.href = base_ui_url + "view/main.html"
 
         }, function(error) {

VisualInspection/js/util/util.js

@@ -307,16 +307,29 @@ function setCheckmanSelect(div,selectId){
 }
 function genAppeaFiles(file_src){
     initStringfunc();
-    var files = $.checkTask.appeal.file_src.split(",");
+    var files = file_src.split(",");
     var optionStr="";
+    
     for(var i in files) {
         var fileSrc = base_image_server_url+files[i];
         if(fileSrc.endWith("png") || fileSrc.endWith("jpg")||fileSrc.endWith("ico")){
-            optionStr+= '<a href="'+fileSrc+'" target="_blank"><img src="'+fileSrc+'" style="height:55px;margin:5px;"></a>';
+            if(ISCLIENT) {
+                optionStr+= '<a href="javascript:void(0)" onclick="showClientImg('+fileSrc+')"><img src="'+fileSrc+'" style="height:55px;margin:5px;"></a>';
+            }else{
+                optionStr+= '<a href="'+fileSrc+'" target="_blank"><img src="'+fileSrc+'" style="height:55px;margin:5px;"></a>';
+            }
         }else if(fileSrc.endWith("doc")|| fileSrc.endWith("docx")){
-            optionStr+= '<a href="'+fileSrc+'" target="_blank"><i class="icon icon-file-word icon-4x" style="vertical-align: middle"></a>';
+            if(ISCLIENT) {
+                optionStr+= '<a href="javascript:void(0)" onclick="downloadClientfile('+fileSrc+')"><i class="icon icon-file-word icon-4x" style="vertical-align: middle"></a>';
+            }else{
+                optionStr+= '<a href="'+fileSrc+'" target="_blank"><i class="icon icon-file-word icon-4x" style="vertical-align: middle"></a>';
+            }
         }else if(fileSrc.endWith("txt")){
-            optionStr+= '<a href="'+fileSrc+'" target="_blank"><i class="icon icon-file-code icon-3x"></a>';
+            if(ISCLIENT) {
+                optionStr+= '<a href="javascript:void(0)" onclick="downloadClientfile('+fileSrc+')"><i class="icon icon-file-code icon-4x" style="vertical-align: middle"></a>';
+            }else{
+                optionStr+= '<a href="'+fileSrc+'" target="_blank"><i class="icon icon-file-code icon-4x" style="vertical-align: middle"></a>';
+            }
         }
     }
     return optionStr;
@@ -345,4 +358,12 @@ function initStringfunc(){
     }         
     return true;   
     };  
+}
+
+function showClientImg(src){
+    callFunc("showImage", src);
+}
+
+function downloadClientfile(src){
+    callFunc("downloadfile", src);
 }

VisualInspection/view/mytask/check.html

@@ -13,7 +13,7 @@
                     <select class="form-control" id="lane" disabled="disabled"></select>
                 </div>
                 <label class="col-sm-1">考核人员</label>
-                <div class="col-sm-3">
+                <div class="col-sm-3" id="user_img_container">
                     <!-- 使用图片 -->
                     <a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle"><img src="../../images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>
                     <label id="checked_person"></label>
@@ -93,7 +93,7 @@
                 <div class="row" class="col-sm-11" style="margin:5px;">
                     <button class="btn btn-primary" type="button" onclick="clearAllImg()" style="margin-right:10px;">清空</button>
                     <button class="btn btn-danger" type="button"  onclick="showScore()" style="margin-right:10px;">评分</button>
-                    <button id="saveEditBtn" class="btn btn-warning" type="button"  onclick="saveEdit()" style="margin-right:10px;">保存修改</button>
+                    <button id="saveEditBtn" class="btn btn-warning" type="button"  onclick="saveEdit()" style="margin-right:10px;display:none;">保存修改</button>
                     <form id="form1" runat="server" method="post" enctype="multipart/form-data" style="float:left;margin-right:10px;"> 
                         <div> 
                             <button id="box" class="btn btn-primary" type="button">上传</button>