打印机页面修改

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -190,7 +190,7 @@
         LEFT JOIN tb_rst_pts_machine_version trpmv ON t.machine_software_version = trpmv.machine_version_id
         LEFT JOIN tb_rst_pts_produce pi ON t.machine_produce_id = pi.produce_id
         where machine_id > #{machineId}
-        order by machine_create_time desc
+        order by t.machine_id asc
     </select>
 
     <select id="maxMachineId" resultType="Integer">

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

@@ -143,7 +143,7 @@
 						</tr>
 					</#list>
                 <#else>
-                <tr><td colspan="11" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
+                <tr><td id="noMachineTr" colspan="11" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
                 </#if>
 				</tbody>
 			</table>
@@ -230,7 +230,7 @@
 
             ref = setInterval(function(){
                 latestMachines();
-            },2000);
+            },3000);
             function  latestMachines() {
                 $.ajax({
                     cache: true,
@@ -239,6 +239,7 @@
                     data:{machineId : $("#machineId").val()},// 你的formid
                     success: function(data){
                         if(data != null){
+                            $("#noMachineTr").remove();
                             $.each(data,function(i,value) {
                                 if(i+1 == data.length){
                                     $("#machineId").val(value.machineId);

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

@@ -83,7 +83,7 @@
                             </tr>
                         </#list>
                         <#else>
-                        <tr><td colspan="6" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
+                        <tr id="noMachineTr"><td colspan="6" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
                         </#if>
                     </tbody>
                 </table>
@@ -251,6 +251,7 @@
                         data:{machineId : $("#machineId").val()},// 你的formid
                         success: function(data){
                             if(data != null){
+                                $("#noMachineTr").remove();
                                 $.each(data,function(i,value) {
                                     if(i+1 == data.length){
                                         $("#machineId").val(value.machineId);