minitiger hace 8 años
padre
commit
ec9c96679b
Se han modificado 2 ficheros con 5 adiciones y 23 borrados
  1. 4 22
      VisualInspection/js/mytask/check.js
  2. 1 1
      VisualInspection/view/main.html

+ 4 - 22
VisualInspection/js/mytask/check.js

@@ -39,7 +39,9 @@ function initCheck() {
     if ($.checkTask) {
         initCheckAppealBtns();
         setFeSelect("#fsList", $.checkTask.checked_dept);
-      
+        // $("#fsList").on("change",function(){
+        //     $.checkTask.checked_dept = this.value;
+        // })
         $("#lane").val($.checkTask.checked_location);
         // setLaneSelect("#lane", $.checkTask.checked_location);
         get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function (data) {
@@ -222,7 +224,7 @@ function genPicstr(src){
     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" onclick="'+src +'" href="javascript:void(0)" style="position:absolute">'
+                + '<a class="card" onclick="showClientImg(\''+src +'\')" href="javascript:void(0)" style="position:absolute">'
                 + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + src + '" alt="">'
                 + '</a>'
                 + '</div>';
@@ -314,7 +316,6 @@ function buildTree() {
     var zTreeObj;
     var zNodes = [];
     check_item_tree = $.fn.zTree.init($("#items_tree"), {}, zNodes);
-
     getCheckItems();
 }
 function getCheckItems() {
@@ -367,14 +368,6 @@ function getCheckItems() {
         zdata = [];
         for (var i = 0; i < data.length; i++) {
             var m = data[i];
-            //  var zdataItem = {};
-            //  zdataItem["id"] = m.id;
-            //  zdataItem["value"] = m.id;
-            //  zdataItem["pId"] = null;
-            //  zdataItem["score"] = m.score ;
-            //  zdataItem["name"] = m.name;
-            //  zdataItem["open"] = true;
-            //  zdataItem["children"] = addobj(m);
             zdata.push(genNode(m));
         }
         menu_tree = $.fn.zTree.init($("#items_tree"), setting, zdata)
@@ -388,17 +381,6 @@ function addobj(data) {
         data.subCheckItem.length > 0) {
         for (var i = 0; i < data.subCheckItem.length; i++) {
             var m = data.subCheckItem[i];
-            //  var zdataItem = {};
-            //  zdataItem["id"] = m.id;
-            //  zdataItem["value"] = m.id;
-            //  zdataItem["pId"] = data.id;
-            //  zdataItem["score"] = m.score ;
-            //  zdataItem["icon"] = "";
-            //  zdataItem["name"] = m.name;
-            //  if(m.score)
-            //     zdataItem["name"] = m.name+'('+m.score+')';
-            //  zdataItem["open"] = true;
-            //  zdataItem["children"] = addobj(m);
             zdata.push(genNode(m));
         }
         return zdata;

+ 1 - 1
VisualInspection/view/main.html

@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="/css/main.css">
     <link rel="import" href="/view/common/commonscriptlink.html?__inline">
     <style>
-        img.lightbox-img{width:600px;height:600px;}
+        img.lightbox-img{width:600px;}
     </style>
     <script src="/js/mytask/check.js"></script>   
     <script src="/js/teamClass/charge_team_schedule.js"></script>