设备列表。添加设备功能

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -21,7 +21,7 @@
 <div class="page-container">
 <div class="text-c">
     <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
-        <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="add_device();">添加设备</button>
+        <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_device();">添加设备</button>
         <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
         <select class="select" name="deviceStatus" style="height: 30px;width: 150px">
             <option value ="">全部</option>
@@ -47,7 +47,9 @@
         </tr>
         </thead>
         <tbody id="listid">
+        <#if (page.dataList?size > 0)>
         <#list page.dataList as device>
+
         <tr>
             <td class="text-c" width="100">${device.deviceNumber!}</td>
             <td class="text-c" width="100">${device.deviceName!}</td>
@@ -89,6 +91,9 @@
             </td>
         </tr>
         </#list>
+        <#else >
+        <tr><td class="td-manage text-c" colspan = "7">暂时没有设备，请添加</td></tr>
+        </#if>
         </tbody>
     </table>
     </div>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl

@@ -18,7 +18,7 @@
 			<form action="${path}/admin/machine/_machine_list" method="post">
 				 	<input class="my-input" type="text" id="printNumber" name="printNumber" value="3" placeholder="打印数量"/>
                 	<input class="my-input" type="hidden" id="settingNumber" name="settingNumber" value="3"/>
-					<button type="button" class="my-btn-search" onclick="setting();" style="margin-right: 50px;">设置</button>
+					<button type="button" class="my-btn-search" onclick="setting();" style="cursor:pointer; margin-right: 50px;">设置</button>
 
 					<input class="my-input" type="text" name="machineBarcode" value="${machineBarcode!''}" placeholder="请输入机器编号"/>
 					<select class="my-select" name="machineIsPrint">
@@ -58,7 +58,7 @@
 							<option value ="2">异常</option>
 						</#if>
 					</select>
-					<button type="submit" class="my-btn-search">搜索</button>
+					<button type="submit" style="cursor:pointer; " class="my-btn-search">搜索</button>
 			</form>
 		</div>
 		<div class="mt-20" style="margin: 20px;">

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -30,8 +30,8 @@
                 <input class="my-input" type="hidden" id="machineIsPrint" name="machineIsPrint"/>
                     每个二维码打印数量：
                 <input class="my-input" type="text" id="settingNumber" name="printNumber" value="3" placeholder="打印数量" style="margin-top: 10px;"/>
-                <button type="button" class="my-btn-search" onclick="printList();" style="margin-right: 50px;margin-top: 10px;">打印</button>
-                    <button type="button" class="my-btn-search" onclick="batchUpdatePring();" style="margin-right: 50px;margin-top: 10px;">修改为已打印</button>
+                <button type="button" class="my-btn-search" onclick="printList();" style="cursor:pointer; margin-right: 50px;margin-top: 10px;">打印</button>
+                    <button type="button" class="my-btn-search" onclick="batchUpdatePring();" style="cursor:pointer; margin-right: 50px;margin-top: 10px;">修改为已打印</button>
 			</form>
 		</div>
 		<div class="mt-2" style="margin: 20px;">