minitiger 9 лет назад
Родитель
Сommit
1537c0575f

+ 3 - 1
VisualInspection/js/util/util.js

@@ -62,9 +62,11 @@ function ajaxDelete(dataurl, data, sucessCallBack, errorCallBack) {
 }
 
 
-var ViewMap = new HashMap()
+var ViewMap = new HashMap();
 ViewMap.set("/view/mytask/unchecked.html", __inline('/view/mytask/unchecked.html'));
 ViewMap.set("/view/mytask/unexamined.html", __inline('/view/mytask/unexamined.html'));
 ViewMap.set("/view/mytask/undispatched.html", __inline('/view/mytask/undispatched.html'));
 ViewMap.set("/view/mytask/dispatched.html", __inline('/view/mytask/dispatched.html'));
+ViewMap.set("/view/mytask/check.html", __inline('/view/mytask/check.html'));
+ViewMap.set("/view/mytask/taskDetail.html", __inline('/view/mytask/taskDetail.html'));
 ViewMap.set("/view/constant/constant.html", __inline('/view/constant/constant.html'));

+ 3 - 3
VisualInspection/view/mytask/check.html

@@ -23,8 +23,8 @@
                     <label for="exampleInputAccount1" class="col-sm-1">考核人员</label>
                     <div class="col-sm-2">
                         <!-- 使用图片 -->
-                        <img data-toggle="lightbox" src="../../images/img4.jpg" data-image="../../images/img4.jpg" data-caption="小图看大图" alt="" width="50">
-                          <label for="exampleInputAccount1">0518 盛兴峰</label>
+                        <img data-toggle="lightbox" src="../../images/img4.jpg" data-image="images/img4.jpg" data-caption="小图看大图" alt="" width="50">
+                        <label for="exampleInputAccount1">0518 盛兴峰</label>
                     </div>
                     <div class="col-sm-2">
                         <button class="btn btn-primary " type="button">更改考核人员</button>
@@ -169,6 +169,6 @@
 
         function showPre(id){
             // $('#myModal').modal({name:"dd"});
-            changePage(getPageInfo("1_1_1_1"));
+            changePage(ViewMap.get("/view/mytask/taskDetail.html"));
         }
     </script>

+ 3 - 3
VisualInspection/view/mytask/preSubmit.html → VisualInspection/view/mytask/taskDetail.html

@@ -42,13 +42,13 @@
                 data: {
                     cols: [
                         {width: 30, text: '序号', type: 'number', flex: true, colClass: 'text-center'},
-                        {width: 200, text: '考核内容', type: 'string', flex: true, sort: 'down'},
+                        {width: 100, text: '考核内容', type: 'string', flex: true, sort: 'down'},
                         {width: 30, text: '扣分', type: 'string', flex: true, colClass: ''},
-                        {width: 30, text: '录像截图', type: 'string', flex: true, colClass: ''},
+                        {width: 200, text: '录像截图', type: 'string', flex: true, colClass: ''},
                         {width: 100, text: '操作', type: 'string', flex: true, colClass: ''}
                     ],
                     rows: [
-                        {checked: false, data: [1, '未按规定收取过路费,着装不规范','10','<div  class="row"><img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图" style="display:inline"  alt="" width="500"><img data-toggle="lightbox" style="display:inline" src="../../images/img4.jpg" data-caption="小图看大图"  alt="" width="500"></div>','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
+                        {checked: false, data: [1, '未按规定收取过路费,着装不规范','10','<img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图" class="img-thumbnail" alt="" width="50"><img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图" class="img-thumbnail" alt="" width="50">',' <a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
                         {checked: false, data: [2, '服务区垃圾房应封闭,房内垃圾入袋,地面无污水','20','<img data-toggle="lightbox" src="../../images/img4.jpg" data-caption="小图看大图"  alt="" width="500"> ','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i>修改 </a><a href="#"><i class="icon icon-remove-circle"></i>删除</a>']},
                         // 更多数据
                     ]

+ 1 - 1
VisualInspection/view/mytask/unchecked.html

@@ -103,6 +103,6 @@
         });
         function showCheck(id){
             // $('#myModal').modal({name:"dd"});
-            changePage(getPageInfo("1_1_1"));
+            changePage(ViewMap.get("/view/mytask/check.html"));
         }
     </script>