Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/js/util/util.js

VisualInspection/js/util/util.js

@@ -166,11 +166,12 @@ function deleteItem4CallBack(cb){
         shade: 0,
         btn: ['确定', '取消'] //按钮
     }, function() {
-        if(cb) cb();
+        if (cb) cb();
     }, function(index) {
         layer.close(index);
     });
 }
+
 function addOrUpdateItem4Common(param, url, okCb) {
     no_return_common_service(url, param, function(data) {
         if (okCb) okCb(); //重新加载表格数据

VisualInspection/view/mytask/taskDetail.html

@@ -91,9 +91,9 @@
     }
     
     .timeline_item_station {
-        left: 45%;
+        left: 42%;
         /* margin-left: 55px; */
-        margin-top: 31px;
+        margin-top: 18px;
         width: 25px;
         height: 25px;
         padding: 15px;
@@ -344,18 +344,18 @@
                         // '   <img src="/images/end.png" style="width: 35px;margin-left: 36px;margin-top: 25px;">' +
                         // '</div>' +
 
-                        '<div class="col-sm-2" style="text-align:center;padding:0px;    margin-bottom: 33px;">' +
+                        '<div class="col-sm-2" style="text-align:center;padding:0px;width: 140px;margin-bottom: 33px;">' +
                         '<div class="row">' +
                         '   <label>' + data[i].check_status_name + '</label>' +
                         '</div>' +
-                        '<div class="row line">' +
+                        '<div class="row line" style="margin-top: 3px;">' +
                         '    <div class="timeline_item_station"></div>' +
                         '</div>' +
-                        '<div class="row">' +
+                        '<div class="row" style="margin-top: -5px;">' +
                         '   <label style="    font-weight: 400;">' + data[i].update_time + '</label>' +
                         '</div>' +
                         (i == data.length - 1 ? (
-                            '   <img src="/images/end.png" style="width: 35px;right: -11px;position: absolute;top: 26px;">'
+                            '   <img src="/images/end.png" style="width: 28px;right:-10px; position: absolute; top:16px;">'
                         ) : "") +
                         '</div>';