Home Explore Help
Sign In
hexiugang
/
iamberry-common-parent
Watch 3
Star 3
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

wangxiaoming 7 years ago
parent
bef166ef3f 5720f0a839
commit
8373e24f1d
3 changed files with 21 additions and 3 deletions
Unified View Show Diff Stats
  1. 7 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl
  2. 7 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl
  3. 7 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/maintenance_list.ftl

+ 7 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl
View File 

@@ -20,6 +20,12 @@
 
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
 
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
 
         /*input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         /*input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}*/
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}*/
 
+        .txt2{
 
+            width:60px;
 
+            overflow: hidden;
 
+            white-space: nowrap;
 
+            text-overflow: ellipsis;
 
+        }
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -122,7 +128,7 @@
 
                             <#--<td>${customer.complaintClassName!''}</td>-->
 
                             <#--<td>${customer.complaintClassName!''}</td>-->
 
                             <td>${customer.smallClassName!''}</td>
 
                             <td>${customer.smallClassName!''}</td>
 
                             <td>
 
                             <td>
 
-                                ${customer.describeTitle!'暂无'}<br/>
 
+                                <span class="label txt2" title="${customer.describeTitle!}" >${customer.describeTitle!'暂无'}</span><br/>
 
                                     <#if customer.describeTitle??>
 
                                     <#if customer.describeTitle??>
 
                                         <a style="text-decoration:none;" href="javascript:void(0);" title="查看详情" onclick="getDescribeInfo(${customer.customerId!''})">
 
                                         <a style="text-decoration:none;" href="javascript:void(0);" title="查看详情" onclick="getDescribeInfo(${customer.customerId!''})">
 
                                             <font color=#06c>查看详情</font>
 
                                             <font color=#06c>查看详情</font>

+ 7 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl
View File 

@@ -14,6 +14,12 @@
 
         .table-bg thead th{background-color: #e2f6ff;}
 
         .table-bg thead th{background-color: #e2f6ff;}
 
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
+        .txt2{
 
+            width:60px;
 
+            overflow: hidden;
 
+            white-space: nowrap;
 
+            text-overflow: ellipsis;
 
+        }
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -97,7 +103,7 @@
 
                     <td class="text-c" width="100">${detect.detectResults!}</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.detectPoint!}</td>
 
                     <td class="text-c" width="100">${detect.detectAnalysis!}</td>
 
                     <td class="text-c" width="100">${detect.detectAnalysis!}</td>
 
-                    <td class="text-c" width="100">${detect.questionTitle!}<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"><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">
 
                     <td class="text-c" width="100">
 
                     <#if detect.detectIsMaintenance??>
 
                     <#if detect.detectIsMaintenance??>
 
                         <#if detect.detectIsMaintenance == 2>
 
                         <#if detect.detectIsMaintenance == 2>

+ 7 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/maintenance_list.ftl
View File 

@@ -15,6 +15,12 @@
 
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
 
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
 
+        .txt2{
 
+            width:60px;
 
+            overflow: hidden;
 
+            white-space: nowrap;
 
+            text-overflow: ellipsis;
 
+        }
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -105,7 +111,7 @@
 
                     </#if>
 
                     </#if>
 
                     </td>
 
                     </td>
 
                     <td class="text-c" width="100">
 
                     <td class="text-c" width="100">
 
-                    ${maintenanceInfo.customerIdDescribe!}<br>
 
+                        <span class="label txt2" title="${maintenanceInfo.customerIdDescribe!}" >${maintenanceInfo.customerIdDescribe!}</span><br>
 
                     <#if maintenanceInfo.customerIdDescribe??><#if maintenanceInfo.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${maintenanceInfo.maintenanceCustomerId!});" style="color : #4149FF;">查看详情</a></#if></#if>
 
                     <#if maintenanceInfo.customerIdDescribe??><#if maintenanceInfo.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${maintenanceInfo.maintenanceCustomerId!});" style="color : #4149FF;">查看详情</a></#if></#if>
 
 
 
                     </td>
 
                     </td>