瀏覽代碼

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl
liujiankang 7 年之前
父節點
當前提交
b5efa87a34
共有 1 個文件被更改,包括 21 次插入12 次删除
  1. 21 12
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

+ 21 - 12
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -20,6 +20,15 @@
             white-space: nowrap;
             text-overflow: ellipsis;
         }
+        .txt{
+            width: 70px;
+
+            overflow: hidden;
+
+            white-space: nowrap;
+
+            text-overflow: ellipsis;
+        }
     </style>
 </head>
 <body>
@@ -64,12 +73,12 @@
                 <th width="100">产品类型</th>
                 <th width="100">产品型号</th>
                 <th width="100">状态</th>
-                <th width="100">工厂检测现象</th>
-                <th width="100">故障分类</th>
-                <th width="150">故障原因</th>
-                <th width="150">判定结果</th>
-                <th width="150">故障指向</th>
-                <th width="150">原因分析</th>
+                <th width="60">工厂检测现象</th>
+                <th width="60">故障分类</th>
+                <th width="60">故障原因</th>
+                <th width="60">判定结果</th>
+                <th width="60">故障指向</th>
+                <th width="60">原因分析</th>
                 <th width="150">客诉描述</th>
                 <th width="150">是否转入生产部门</th>
                 <th width="150">备注</th>
@@ -97,12 +106,12 @@
                             检查通过
                         </#if>
                     </td>
-                    <td class="text-c" width="100">${detect.detectPhenomenon!}</td>
-                    <td class="text-c" width="100">${detect.detectFailureClassification!}</td>
-                    <td class="text-c" width="100">${detect.detectFailureCause!}</td>
-                    <td class="text-c" width="100">${detect.detectResults!}</td>
-                    <td class="text-c" width="100">${detect.detectPoint!}</td>
-                    <td class="text-c" width="100">${detect.detectAnalysis!}</td>
+                    <td class="text-c" width="60"><div class="txt" title="${detect.detectPhenomenon!}">${detect.detectPhenomenon!}</div></td>
+                    <td class="text-c" width="60"><div class="txt" title="${detect.detectFailureClassification!}">${detect.detectFailureClassification!}</div></td>
+                    <td class="text-c" width="60"><div class="txt" title="${detect.detectFailureCause!}">${detect.detectFailureCause!}</div></td>
+                    <td class="text-c" width="60"><div class="txt" title="${detect.detectResults!}">${detect.detectResults!}</div></td>
+                    <td class="text-c" width="60"><div class="txt" title="${detect.detectPoint!}">${detect.detectPoint!}</div></td>
+                    <td class="text-c" width="60"><div class="txt" title="${detect.detectAnalysis!}">${detect.detectAnalysis!}</div></td>
                     <td class="text-c" width="100"><span class="label txt2" title="${detect.questionTitle!}" >${detect.questionTitle!}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #4149FF;">查看详情</a></#if></#if></td>
                     <td class="text-c" width="100">
                     <#if detect.detectIsMaintenance??>