修改了设备页面样式

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

@@ -32,6 +32,7 @@
                 and device_id = #{deviceId}
             </if>
         </where>
+        ORDER BY device_id DESC
     </select>
 
     <resultMap type="PtsDevice" id="deviceMap">

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java

@@ -119,7 +119,7 @@ public class EquipmentController {
     public ModelAndView selectDeviceList(HttpServletRequest request,
                                          @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
                                          @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
-                                         @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize
+                                         @RequestParam(value = "pageSize", defaultValue = "10", required = false) int pageSize
                                          ) throws Exception {
         ModelAndView mv = new ModelAndView("pts/device/device_list");
         StringBuilder url = new StringBuilder("/admin/equipment/select_device_list?pageSize=" + pageSize);

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

@@ -32,9 +32,9 @@
             <span class="input-dic">设备编号</span>
             <input class="my-input" type="text" value="" maxlength="10" minlength="2" name="deviceNumber" id="deviceNumber" placeholder="请输入设备编号，请输入英文、数字，2-10位"/>
         </div>
-        <div class="input-box"><span class="input-dic">设备姓名</span><input class="my-input" type="text" value="" name="deviceName" id="deviceName" placeholder="请输入设备名称，中文和英文"/> </div>
-        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="" name="device_date" id="device_date" placeholder="请选择购买日期" onClick="WdatePicker()" readonly="readonly"/> </div>
-        <div class="input-box"><span class="input-dic">设备状态</span> <input type="radio" id="radio1" name="deviceStatus" value="1" checked/><label for="radio1">正常使用</label><input type="radio" id="radio2" name="deviceStatus" value="0"/><label for="radio3">设备停用</label> </div>
+        <div class="input-box"><span class="input-dic">设备名称</span><input class="my-input" type="text" value="" name="deviceName" id="deviceName" placeholder="请输入设备名称，中文和英文"/> </div>
+        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="" name="device_date" id="device_date" placeholder="请选择购买日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" readonly="readonly"/> </div>
+        <div class="input-box"><span class="input-dic">设备状态</span><label for="radio-10"><input type="radio" id="radio-10" name="deviceStatus" value="1" checked/>正常使用</label><label for="radio-11" style="margin-left: 50px;"><input type="radio" id="radio-11" name="deviceStatus" value="0"/>设备停用</label> </div>
         <#--<div class="input-box"><span class="input-dic">作用流程</span>
             <ul class="add-list">
 
@@ -90,12 +90,12 @@
         var deviceName = $('#deviceName').val();
         if (deviceNumber == null || !check_number.test(deviceNumber)) {
             flag = false;
-            alert("设备编号格式不正确，请重新输入!");
+            layer.msg('设备编号格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         if (deviceName == null || !check_name.test(deviceName)) {
             flag = false;
-            alert("设备名称格式不正确，请重新输入!");
+            layer.msg('设备名称格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         return flag;

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

@@ -21,19 +21,22 @@
 <div class="page-container">
 <div class="text-c">
     <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
-        <button type="button" 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>
+            <option value ="">全部</option>
             <option value ="0" <#if deviceStatus??><#if deviceStatus == 0>selected="selected"</#if></#if>>停止使用</option>
             <option value ="1" <#if deviceStatus??><#if deviceStatus == 1>selected="selected"</#if></#if>>正常使用</option>
         </select>
         <input class="my-input" type="text" name="deviceName" value="${deviceName!}" placeholder="请输入设备名称"/>
         <input class="my-input" type="text" name="deviceRemake" value="${deviceRemake!}" placeholder="请输入备注"/>
-        <button type="submit" class="my-btn-search">搜索</button>
+        <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
     </form>
 </div>
-<div class="mt-20">
+<div class="cl pd-5 bk-gray mt-20">
+        <span class="l">
+            <button onClick="add_device();" class="btn radius" style="background: #58d2ea;color: #fff;" type="button"><i class="Hui-iconfont">&#xe604;</i>添加设备</button>
+        </span>
+</div>
     <table class="table table-border table-bordered table-bg table-hover table-sort">
         <thead>
         <tr class="text-c">
@@ -92,7 +95,6 @@
         </tbody>
     </table>
 </div>
-</div>
 <div style="padding-top: 10px;"></div>
 <#include "/base/page_util.ftl">
 

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

@@ -30,11 +30,11 @@
         <div class="my-title">设备信息</div>
         <input class="my-input" type="hidden" value="${device.deviceId!}" name="deviceId" id="deviceId" placeholder="请输入设备编号"/>
         <div class="input-box"><span class="input-dic">设备编号</span><input class="my-input" type="text" value="${device.deviceNumber!}" name="deviceNumber" id="deviceNumber" placeholder="请输入设备编号"/> </div>
-        <div class="input-box"><span class="input-dic">设备姓名</span><input class="my-input" type="text" value="${device.deviceName!}" name="deviceName" id="deviceName" placeholder="请输入设备姓名"/> </div>
-        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="${(device.deviceDate?string("yyyy-MM-dd"))!''}" onClick="WdatePicker()" name="device_date" id="device_date" placeholder="请选择购买日期" readonly="readonly"/> </div>
+        <div class="input-box"><span class="input-dic">设备名称</span><input class="my-input" type="text" value="${device.deviceName!}" name="deviceName" id="deviceName" placeholder="请输入设备姓名"/> </div>
+        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="${(device.deviceDate?string("yyyy-MM-dd"))!''}" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" name="device_date" id="device_date" placeholder="请选择购买日期" readonly="readonly"/> </div>
         <div class="input-box"><span class="input-dic">设备状态</span>
-            <input type="radio" id="radio1" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 1>checked</#if></#if> value="1"/><label for="radio1">正常使用</label>
-            <input type="radio" id="radio2" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 0>checked</#if></#if> value="0"/><label for="radio3">设备停用</label>
+            <label for="radio-10"><input type="radio" id="radio-10" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 1>checked</#if></#if> value="1"/>正常使用</label>
+            <label for="radio-11" style="margin-left: 50px;"><input type="radio" id="radio-11" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 0>checked</#if></#if> value="0"/>设备停用</label>
         </div>
         <div style="clear: both;"></div>
         <div class="input-box"><span class="input-dic">设备备注</span>
@@ -56,12 +56,12 @@
         var deviceName = $('#deviceName').val();
         if (deviceNumber == null || !check_number.test(deviceNumber)) {
             flag = false;
-            alert("设备编号格式不正确，请重新输入!");
+            layer.msg('设备编号格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         if (deviceName == null || !check_name.test(deviceName)) {
             flag = false;
-            alert("设备名称格式不正确，请重新输入!");
+            layer.msg('设备名称格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         return flag;

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

@@ -153,7 +153,7 @@
         .add-title-right{position: absolute;left: 55%;top:33%;}
         .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 5px 0 5px 0;}
         .list-main{list-style-type: none;margin: 0;padding: 10px;overflow-x: scroll;white-space: nowrap;}
-        .list-main>li{display: table-cell;min-width: 450px;position: relative;width: 450px;margin-right: 20px;border: 1px solid rgba(0,0,0,.1);}
+        .list-main>li{display: table-cell;min-width: 400px;position: relative;width: 400px;margin-right: 20px;border: 1px solid rgba(0,0,0,.1);}
     </style>
 <#include "/base/list_base.ftl">
 </head>
@@ -484,7 +484,7 @@
         var id = obj.getAttribute("id");
         var value = $('#' + id + ' option:selected').val();
         var data = null;
-        if (confirm("您确定修改吗？")) {
+        layer.confirm('确认要修改吗？',function(index){
             //num=1则是修改员工信息，num=2则是修改设备信息
             if (num == 1) {
                 data = {
@@ -505,15 +505,16 @@
                 async: false,
                 success: function(dt){
                     if (dt.returnCode == 200) {
-                        alert('恭喜您，修改成功!');
+                        layer.msg('恭喜您，修改成功!',{icon: 1,time:1000});
                     } else {
-                        alert('对不起，修改失败!');
+                        layer.msg('对不起，修改失败!',{icon: 5,time:1000});
                     }
                 }
             })
-        } else {
+        }, function() {
             location.reload();
         }
+        );
     }
 </script>
 </body>