首页 发现 帮助
登录
hexiugang
/
iamberry-common-parent
关注 3
点赞 3
派生 1
文件 工单管理 0 合并请求 0 Wiki
浏览代码

样式修改

qihanjiao 7 年之前
父节点
aca74489ee
当前提交
c56facac58
共有 15 个文件被更改，包括 90 次插入 和 58 次删除
合并视图 显示文件统计
  1. 5 3
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl
  2. 4 4
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl
  3. 3 1
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl
  4. 16 21
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl
  5. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl
  6. 8 6
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl
  7. 11 9
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl
  8. 8 1
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl
  9. 7 0
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_particulars.ftl
  10. 7 2
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl
  11. 2 0
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/produce_list.ftl
  12. 6 4
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl
  13. 7 5
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl
  14. 4 0
      watero-rst-web/src/main/webapp/WEB-INF/views/sys/add_admin.ftl
  15. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/sys/list_admin.ftl

+ 5 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl
查看文件 

@@ -17,15 +17,17 @@
 
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
+        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;}
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
     <span class="c-gray en">&gt;</span> PST管理
 
     <span class="c-gray en">&gt;</span> PST管理
 
     <span class="c-gray en">&gt;</span> 添加设备
 
     <span class="c-gray en">&gt;</span> 添加设备
 
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 </nav>
 
-<div style="padding: 10px; padding-left: 250px;">
 
+<div style="padding: 10px; width: 600px;margin: 0 auto;">
 
     <form class="form-horizontal" action="${path}/admin/equipment/add_equpment" id="form-admin-add">
 
     <form class="form-horizontal" action="${path}/admin/equipment/add_equpment" id="form-admin-add">
 
         <div class="my-title">设备信息</div>
 
         <div class="my-title">设备信息</div>
 
         <div class="input-box">
 
         <div class="input-box">
 
@@ -34,7 +36,7 @@
 
         </div>
 
         </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" 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><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" style="margin-top: 0">设备状态</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>
 
         <#--<div class="input-box"><span class="input-dic">作用流程</span>
 
             <ul class="add-list">
 
             <ul class="add-list">

+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl
查看文件 

@@ -7,8 +7,8 @@
 
         *{padding: 0;margin: 0;}
 
         *{padding: 0;margin: 0;}
 
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
         .my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
         .my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
 
-        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 36px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 36px;background-color: #32a3d8;color: #fff;}
 
     </style>
 
     </style>
 
 <#include "/base/list_base.ftl">
 
 <#include "/base/list_base.ftl">
 
 </head>
 
 </head>
 
@@ -16,14 +16,14 @@
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
     <span class="c-gray en">&gt;</span> PST管理
 
     <span class="c-gray en">&gt;</span> PST管理
 
     <span class="c-gray en">&gt;</span> 设备列表
 
     <span class="c-gray en">&gt;</span> 设备列表
 
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 </nav>
 
 <div class="page-container">
 
 <div class="page-container">
 
 <div class="text-c">
 
 <div class="text-c">
 
     <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
 
     <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;" class="my-btn-search" onclick="add_device();">添加设备</button>
 
         <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
 
         <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
 
-        <select class="select" name="deviceStatus" style="height: 30px;width: 150px">
 
+        <select class="my-select" name="deviceStatus">
 
             <option value ="">全部</option>
 
             <option value ="">全部</option>
 
             <option value ="0" <#if deviceStatus??><#if deviceStatus == 0>selected="selected"</#if></#if>>停止使用</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>
 
             <option value ="1" <#if deviceStatus??><#if deviceStatus == 1>selected="selected"</#if></#if>>正常使用</option>

+ 3 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl
查看文件 

@@ -17,13 +17,15 @@
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
+        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;}
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
     <span class="c-gray en">&gt;</span> PST管理
 
     <span class="c-gray en">&gt;</span> PST管理
 
     <span class="c-gray en">&gt;</span> 修改设备
 
     <span class="c-gray en">&gt;</span> 修改设备
 
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 </nav>
 
 <div style="padding: 10px;padding-left: 250px;">
 
 <div style="padding: 10px;padding-left: 250px;">
 
     <form class="form-horizontal" action="${path}/admin/equipment/update_device" id="form-admin-add">
 
     <form class="form-horizontal" action="${path}/admin/equipment/update_device" id="form-admin-add">

+ 16 - 21
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl
查看文件 

@@ -76,8 +76,10 @@
 
         }
 
         }
 
 
 
         .content {
 
         .content {
 
-            width: 100%;
 
+            width: 90% !important;
 
             margin: 0 auto;
 
             margin: 0 auto;
 
+            border: 1px solid rgba(0,0,0,.1);
 
+            padding-bottom: 20px;
 
         }
 
         }
 
         .content article {
 
         .content article {
 
             position: relative;
 
             position: relative;
 
@@ -112,9 +114,10 @@
 
             display: block;
 
             display: block;
 
             position: absolute;
 
             position: absolute;
 
             text-align: right;
 
             text-align: right;
 
+            padding-left: 10px;
 
         }
 
         }
 
         .content article section time > span {
 
         .content article section time > span {
 
-            display: block;
 
+            display: block;margin-right: 10px;
 
         }
 
         }
 
         .content article section aside {
 
         .content article section aside {
 
             color: #3a3a38;
 
             color: #3a3a38;
 
@@ -133,31 +136,22 @@
 
         }
 
         }
 
 
 
         /*设置Select样式*/
 
         /*设置Select样式*/
 
-        select {
 
-            border-width: 0px;
 
-            border-top-style: none;
 
-            border-right-style: none;
 
-            border-left-style: none;
 
-            border-bottom-style: none;
 
-            overflow:hidden;
 
-            -webkit-appearance: none;
 
-            text-align: center;
 
-        }
 
-
 
-        select option {
 
-            text-align: center;
 
-            font-size:15px;
 
-        }
 
-
 
+        select{border: 1px solid rgba(0,0,0,.1);padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;margin-right: 10px;}
 
         .add-title-left{position: absolute;right: 0;top: 15%;}
 
         .add-title-left{position: absolute;right: 0;top: 15%;}
 
         .add-title-right{position: absolute;left: 55%;top:33%;}
 
         .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;}
 
         .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{list-style-type: none;margin: 0;padding: 10px;overflow-x: scroll;white-space: nowrap;}
 
-        .list-main>li{display: table-cell;min-width: 400px;position: relative;width: 400px;margin-right: 20px;border: 1px solid rgba(0,0,0,.1);}
 
+        .list-main>li{display: table-cell;min-width: 500px;position: relative;width: 500px;margin-right: 20px;}
 
     </style>
 
     </style>
 
 <#include "/base/list_base.ftl">
 
 <#include "/base/list_base.ftl">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
+    <span class="c-gray en">&gt;</span> PST管理
 
+    <span class="c-gray en">&gt;</span> 设备列表
 
+    <span class="c-gray en">&gt;</span> 查看作用流程岗位
 
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+</nav>
 
 <div><input type="hidden" value="${deviceId!}" id="deviceId"></div>
 
 <div><input type="hidden" value="${deviceId!}" id="deviceId"></div>
 
 <ul class="list-main">
 
 <ul class="list-main">
 
     <#--<li>
 
     <#--<li>
 
@@ -365,6 +359,7 @@
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
 
 
     $(function(){
 
     $(function(){
 
+        $(".list-main").css("height",$(window).height()-20);
 
         var deviceId = $('#deviceId').val();
 
         var deviceId = $('#deviceId').val();
 
         $.ajax({
 
         $.ajax({
 
             cache: true,
 
             cache: true,
 
@@ -424,7 +419,7 @@
 
                                     var device_list = this;
 
                                     var device_list = this;
 
                                     device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
 
                                     device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
 
                                 });
 
                                 });
 
-                                tb_device = '(<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>)';
 
+                                tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>';
 
                             } else {
 
                             } else {
 
                                 var device_option = '';
 
                                 var device_option = '';
 
                                 $.each(deviceList, function(n,nobj){
 
                                 $.each(deviceList, function(n,nobj){
 
@@ -435,7 +430,7 @@
 
                                         device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
 
                                         device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
 
                                     }
 
                                     }
 
                                 });
 
                                 });
 
-                                tb_device = '(<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>)';
 
+                                tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>';
 
                             }
 
                             }
 
                             if (j % 2 == 0) {
 
                             if (j % 2 == 0) {
 
                                 process += '<section>'
 
                                 process += '<section>'

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl
查看文件 

@@ -18,7 +18,7 @@
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
     <span class="c-gray en">&gt;</span> 员工管理
 
     <span class="c-gray en">&gt;</span> 员工管理
 
     <span class="c-gray en">&gt;</span> 员工列表
 
     <span class="c-gray en">&gt;</span> 员工列表
 
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 </nav>
 
 <div class="page-container">
 
 <div class="page-container">
 
     <div class="text-c">
 
     <div class="text-c">

+ 8 - 6
watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl
查看文件 

@@ -11,16 +11,18 @@
 
     <style>
 
     <style>
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
-        .my-input{padding: 5px 10px;width: 60%;}
 
-        .my-input-date{padding: 5px 10px;width: 60%;background: url(${path}/common/images/pts//rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
+        .my-input{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
 
+        .my-input-date{padding: 5px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(${path}/common/images/pts//rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
         .input-box{margin: 18px 0;}
 
         .input-box{margin: 18px 0;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
         .add-list>li{margin: 10px 0;}
 
         .add-list>li{margin: 10px 0;}
 
-        .my-textarea{padding: 5px 10px;width: 60%;}
 
+        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
+        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;}
 
     </style>
 
     </style>
 
     <title>添加员工- 员工管理 - RST</title>
 
     <title>添加员工- 员工管理 - RST</title>
 
 </head>
 
 </head>
 
@@ -28,7 +30,7 @@
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
     <span class="c-gray en">&gt;</span> 员工管理
 
     <span class="c-gray en">&gt;</span> 员工管理
 
     <span class="c-gray en">&gt;</span> 添加员工
 
     <span class="c-gray en">&gt;</span> 添加员工
 
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 </nav>
 
 <article class="page-container">
 
 <article class="page-container">
 
     <form class="form form-horizontal" id="form-admin-addEmployee">
 
     <form class="form form-horizontal" id="form-admin-addEmployee">
 
@@ -37,11 +39,11 @@
 
             <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" id="employeeNo" type="text" value="" placeholder="请输入员工编号" required   maxlength="10" /> <span style="color: red;" id="employeeNoMsg"></span></div>
 
             <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" id="employeeNo" type="text" value="" placeholder="请输入员工编号" required   maxlength="10" /> <span style="color: red;" id="employeeNoMsg"></span></div>
 
             <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" type="text" value="" placeholder="请输入员工姓名" required   maxlength="20" /> </div>
 
             <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" type="text" value="" placeholder="请输入员工姓名" required   maxlength="20" /> </div>
 
             <div class="input-box"><span class="input-dic">员工电话</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="" placeholder="请输入员工手机号码" required   maxlength="11" minlength="11" /><span style="color: red;" id="employeeTelMsg"></span> </div>
 
             <div class="input-box"><span class="input-dic">员工电话</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="" placeholder="请输入员工手机号码" required   maxlength="11" minlength="11" /><span style="color: red;" id="employeeTelMsg"></span> </div>
 
-            <div class="input-box"><span class="input-dic">员工状态</span>&nbsp;&nbsp;
 
+            <div class="input-box"><span class="input-dic" style="margin-top: 0">员工状态</span>&nbsp;&nbsp;
 
                 <input type="radio" id="employeeState1" name="employeeState" value="1" checked/><label for="employeeState1">在职</label>
 
                 <input type="radio" id="employeeState1" name="employeeState" value="1" checked/><label for="employeeState1">在职</label>
 
                 <input type="radio" id="employeeState2" name="employeeState" value="0"/><label for="employeeState2">离职</label>
 
                 <input type="radio" id="employeeState2" name="employeeState" value="0"/><label for="employeeState2">离职</label>
 
             </div>
 
             </div>
 
-            <div class="input-box"><span class="input-dic">清空卡权限</span>
 
+            <div class="input-box"><span class="input-dic" style="margin-top: 0">清空卡权限</span>
 
                 <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="1" /><label for="employeeClearPower1">具有</label>
 
                 <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="1" /><label for="employeeClearPower1">具有</label>
 
                 <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="0" checked /><label for="employeeClearPower2">不具有</label>
 
                 <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="0" checked /><label for="employeeClearPower2">不具有</label>
 
             </div>
 
             </div>

+ 11 - 9
watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl
查看文件 

@@ -11,16 +11,18 @@
 
     <style>
 
     <style>
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
-        .my-input{padding: 5px 10px;width: 60%;}
 
-        .my-input-date{padding: 5px 10px;width: 60%;background: url(${path}/common/images/pts//rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
+        .my-input{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
 
+        .my-input-date{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);background: url(${path}/common/images/pts//rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
         .input-box{margin: 18px 0;}
 
         .input-box{margin: 18px 0;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
         .add-list>li{margin: 10px 0;}
 
         .add-list>li{margin: 10px 0;}
 
-        .my-textarea{padding: 5px 10px;width: 60%;}
 
-        .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
-        .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
+        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
 
+        .my-btn-reset{padding: 8px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
+        .my-btn-submit{padding: 8px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
+        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;}
 
     </style>
 
     </style>
 
     <title>添加员工- 员工管理 - RST</title>
 
     <title>添加员工- 员工管理 - RST</title>
 
 </head>
 
 </head>
 
@@ -28,7 +30,7 @@
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
     <span class="c-gray en">&gt;</span> 员工管理
 
     <span class="c-gray en">&gt;</span> 员工管理
 
     <span class="c-gray en">&gt;</span> 修改员工
 
     <span class="c-gray en">&gt;</span> 修改员工
 
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 </nav>
 
 <article class="page-container">
 
 <article class="page-container">
 
     <form class="form form-horizontal" id="form-admin-addEmployee">
 
     <form class="form form-horizontal" id="form-admin-addEmployee">
 
@@ -38,11 +40,11 @@
 
             <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" type="text" value="${employee.employeeNo!}" placeholder="请输入员工编号" required   maxlength="10" /> </div>
 
             <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" type="text" value="${employee.employeeNo!}" placeholder="请输入员工编号" required   maxlength="10" /> </div>
 
             <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" type="text" value="${employee.employeeName!}" placeholder="请输入员工姓名" required   maxlength="20" /> </div>
 
             <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" type="text" value="${employee.employeeName!}" placeholder="请输入员工姓名" required   maxlength="20" /> </div>
 
             <div class="input-box"><span class="input-dic">员工电话</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" type="text" value="${employee.employeeTel!}" placeholder="请输入员工手机号码" required   maxlength="11" minlength="11" /> </div>
 
             <div class="input-box"><span class="input-dic">员工电话</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" type="text" value="${employee.employeeTel!}" placeholder="请输入员工手机号码" required   maxlength="11" minlength="11" /> </div>
 
-            <div class="input-box"><span class="input-dic">员工状态</span>&nbsp;&nbsp;
 
+            <div class="input-box"><span class="input-dic" style="margin-top: 0">员工状态</span>&nbsp;&nbsp;
 
                 <input type="radio" id="employeeState1" name="employeeState" value="1" <#if employee.employeeState == 1>checked</#if>/><label for="employeeState1">在职</label>
 
                 <input type="radio" id="employeeState1" name="employeeState" value="1" <#if employee.employeeState == 1>checked</#if>/><label for="employeeState1">在职</label>
 
                 <input type="radio" id="employeeState2" name="employeeState" value="0" <#if employee.employeeState == 0>checked</#if>/><label for="employeeState2">离职</label>
 
                 <input type="radio" id="employeeState2" name="employeeState" value="0" <#if employee.employeeState == 0>checked</#if>/><label for="employeeState2">离职</label>
 
             </div>
 
             </div>
 
-            <div class="input-box"><span class="input-dic">清空卡权限</span>
 
+            <div class="input-box"><span class="input-dic" style="margin-top: 0">清空卡权限</span>
 
                 <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="1" <#if employee.employeeClearPower == 1>checked</#if>/><label for="employeeClearPower1">具有</label>
 
                 <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="1" <#if employee.employeeClearPower == 1>checked</#if>/><label for="employeeClearPower1">具有</label>
 
                 <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="0" <#if employee.employeeClearPower == 0>checked</#if>/><label for="employeeClearPower2">不具有</label>
 
                 <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="0" <#if employee.employeeClearPower == 0>checked</#if>/><label for="employeeClearPower2">不具有</label>
 
             </div>
 
             </div>
 
@@ -52,7 +54,7 @@
 
             <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" value="${employee.employeePost!}" placeholder="请输入员工岗位" required   maxlength="100"/> </div>
 
             <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" value="${employee.employeePost!}" placeholder="请输入员工岗位" required   maxlength="100"/> </div>
 
 
 
             <div style="clear: both;"></div>
 
             <div style="clear: both;"></div>
 
-            <div class="input-box"><span class="input-dic">员工备注</span>&nbsp;&nbsp;
 
+            <div class="input-box"><span class="input-dic">员工备注</span>&nbsp;
 
                 <textarea rows="3" cols="20" class="my-textarea" name="employeeDesc">${employee.employeeDesc!}</textarea>
 
                 <textarea rows="3" cols="20" class="my-textarea" name="employeeDesc">${employee.employeeDesc!}</textarea>
 
             </div>
 
             </div>
 
             <div>
 
             <div>

+ 8 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl
查看文件 

@@ -7,14 +7,21 @@
 
 			*{padding: 0;margin: 0;}
 
 			*{padding: 0;margin: 0;}
 
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
 			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
 			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
-			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
             .barcodeImg{margin:10px 0px}
 
             .barcodeImg{margin:10px 0px}
 
             .table-bg thead th{background-color: #e2f6ff;}
 
             .table-bg thead th{background-color: #e2f6ff;}
 
+            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;}
 
 		</style>
 
 		</style>
 
 		<#include "/base/list_base.ftl">
 
 		<#include "/base/list_base.ftl">
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
+    <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
+        <span class="c-gray en">&gt;</span> PST管理
 
+        <span class="c-gray en">&gt;</span> 机器列表
 
+        <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    </nav>
 
 		<div class="text-c" style="margin-top: 20px;">
 
 		<div class="text-c" style="margin-top: 20px;">
 
 			<form action="${path}/admin/machine/_machine_list" method="post">
 
 			<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="text" id="printNumber" name="printNumber" value="3" placeholder="打印数量"/>

+ 7 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_particulars.ftl
查看文件 

@@ -123,10 +123,17 @@
 
 			}
 
 			}
 
 			.things>.items{margin: 0 15px;}
 
 			.things>.items{margin: 0 15px;}
 
 			p{margin: 0;}
 
 			p{margin: 0;}
 
+            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;}
 
 		</style>
 
 		</style>
 
 	<#include "/base/list_base.ftl">
 
 	<#include "/base/list_base.ftl">
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
+    <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
+        <span class="c-gray en">&gt;</span> PST管理
 
+        <span class="c-gray en">&gt;</span> 产品生产详情
 
+        <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    </nav>
 
 		<div style="padding: 10px;">
 
 		<div style="padding: 10px;">
 
 			<div class="my-title">产品生产详情</div>
 
 			<div class="my-title">产品生产详情</div>
 
 			<ul class="my-list">
 
 			<ul class="my-list">

+ 7 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl
查看文件 

@@ -7,7 +7,7 @@
 
             *{padding: 0;margin: 0;}
 
             *{padding: 0;margin: 0;}
 
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
 			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
 			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
-			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
             .barcodeImg{margin:10px 0px}
 
             .barcodeImg{margin:10px 0px}
 
 			.isprint{width: 200px;height:50px;}
 
 			.isprint{width: 200px;height:50px;}
 
@@ -16,6 +16,11 @@
 
 		<#include "/base/list_base.ftl">
 
 		<#include "/base/list_base.ftl">
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
+    <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
+        <span class="c-gray en">&gt;</span> PST管理
 
+        <span class="c-gray en">&gt;</span> 机器打印列表
 
+        <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    </nav>
 
 		<div class="text-c" style="margin-top: 20px;">
 
 		<div class="text-c" style="margin-top: 20px;">
 
 			<form action="${path}/admin/machine/_machine_print_list" method="post">
 
 			<form action="${path}/admin/machine/_machine_print_list" method="post">
 
 
 
@@ -28,7 +33,7 @@
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
                 <input class="my-input" type="hidden" id="machineIsPrint" name="machineIsPrint"/>
 
                 <input class="my-input" type="hidden" id="machineIsPrint" name="machineIsPrint"/>
 
-                    每个二维码打印数量：
 
+                    <input  class="my-input" type="text" value="每个二维码打印数量：" readonly="readonly" style="border: 0;margin-top: 8px;margin-right: 0"/>
 
                 <input class="my-input" type="text" id="settingNumber" name="printNumber" value="3" placeholder="打印数量" style="margin-top: 10px;"/>
 
                 <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="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="batchUpdatePring();" style="margin-right: 50px;margin-top: 10px;">修改为已打印</button>

+ 2 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/produce_list.ftl
查看文件 

@@ -27,6 +27,8 @@
 
         .chanpin-list>.li-add:before{content: '';width: 5px;height: 80px; position: absolute;left: 50%;top: 90px;background-color: #32a3d8;border-radius: 50px;}
 
         .chanpin-list>.li-add:before{content: '';width: 5px;height: 80px; position: absolute;left: 50%;top: 90px;background-color: #32a3d8;border-radius: 50px;}
 
         .chanpin-list>.li-add:after{content: '';height: 5px;width: 80px;position: absolute;left: 75px;top: 128px;background-color: #32a3d8;border-radius: 50px;-webkit-transform:scaleX(1);}
 
         .chanpin-list>.li-add:after{content: '';height: 5px;width: 80px;position: absolute;left: 75px;top: 128px;background-color: #32a3d8;border-radius: 50px;-webkit-transform:scaleX(1);}
 
         .chanpin-list>.li-add>div{display: table-cell;vertical-align: middle;height: 100%;width: 100%;text-align: center;color: #32a3d8;}
 
         .chanpin-list>.li-add>div{display: table-cell;vertical-align: middle;height: 100%;width: 100%;text-align: center;color: #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]: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;}
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>

+ 6 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl
查看文件 

@@ -15,13 +15,15 @@
 
         .input-box{margin: 18px 0;}
 
         .input-box{margin: 18px 0;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
-        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin:0 10px;}
 
+        .my-btn-edit{padding: 8px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin:0 10px;}
 
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .add-list>li{margin: 10px 0;}
 
         .add-list>li{margin: 10px 0;}
 
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
 
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
 
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
 
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
 
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+        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;}
 
     </style>
 
     </style>
 
     <title>添加生产产品- 生产产品管理 - RST</title>
 
     <title>添加生产产品- 生产产品管理 - RST</title>
 
 </head>
 
 </head>
 
@@ -36,7 +38,7 @@
 
                 <label><input type="radio" name="produceType" value="1" checked>净水机</label>
 
                 <label><input type="radio" name="produceType" value="1" checked>净水机</label>
 
                 <label><input type="radio" name="produceType" value="2">冲奶机</label>
 
                 <label><input type="radio" name="produceType" value="2">冲奶机</label>
 
             </div>
 
             </div>
 
-            <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
 
+            <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;width: 93%;"></div>
 
             <div class="my-title">节点信息</div>
 
             <div class="my-title">节点信息</div>
 
 
 
             <ul class="cp-list onrTheProcess" id="sortable">
 
             <ul class="cp-list onrTheProcess" id="sortable">
 
@@ -66,7 +68,7 @@
 
             </ul>
 
             </ul>
 
 
 
             <div style="clear: both;"></div>
 
             <div style="clear: both;"></div>
 
-            <div><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
 
+            <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
 
             <div>
 
             <div>
 
                 <button type="reset" class="my-btn-reset" >重置</button><button type="submit" class="my-btn-submit">确认提交</button>
 
                 <button type="reset" class="my-btn-reset" >重置</button><button type="submit" class="my-btn-submit">确认提交</button>
 
             </div>
 
             </div>

+ 7 - 5
watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl
查看文件 

@@ -11,17 +11,19 @@
 
     <style>
 
     <style>
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
-        .my-input{padding: 5px 10px;width: 60%;}
 
+        .my-input{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1)}
 
         .input-box{margin: 18px 0;}
 
         .input-box{margin: 18px 0;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
-        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
+        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 0 10px;}
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .add-list>li{margin: 10px 0;}
 
         .add-list>li{margin: 10px 0;}
 
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
 
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
 
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
 
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
 
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+        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;}
 
     </style>
 
     </style>
 
     <title>修改生产产品- 生产产品管理 - RST</title>
 
     <title>修改生产产品- 生产产品管理 - RST</title>
 
 </head>
 
 </head>
 
@@ -37,7 +39,7 @@
 
                 <label><input type="radio" name="produceType" value="1" <#if produce.produceType == 1>checked</#if>>净水机</label>
 
                 <label><input type="radio" name="produceType" value="1" <#if produce.produceType == 1>checked</#if>>净水机</label>
 
                 <label><input type="radio" name="produceType" value="2" <#if produce.produceType == 2>checked</#if>>冲奶机</label>
 
                 <label><input type="radio" name="produceType" value="2" <#if produce.produceType == 2>checked</#if>>冲奶机</label>
 
             </div>
 
             </div>
 
-            <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
 
+            <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;width: 93%;"></div>
 
             <div class="my-title">节点信息</div>
 
             <div class="my-title">节点信息</div>
 
 
 
 
 
@@ -75,7 +77,7 @@
 
 
 
 
 
             <div style="clear: both;"></div>
 
             <div style="clear: both;"></div>
 
-            <div><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
 
+            <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
 
             <div>
 
             <div>
 
                 <button type="reset" class="my-btn-reset" >重置</button><button type="submit" class="my-btn-submit">确认提交</button>
 
                 <button type="reset" class="my-btn-reset" >重置</button><button type="submit" class="my-btn-submit">确认提交</button>
 
             </div>
 
             </div>

+ 4 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/sys/add_admin.ftl
查看文件 

@@ -10,6 +10,10 @@
 
     <title>添加更换滤芯 - 更换滤芯管理 - H-ui.filter v2.4</title>
 
     <title>添加更换滤芯 - 更换滤芯管理 - H-ui.filter v2.4</title>
 
     <meta name="keywords" content="${path}">
 
     <meta name="keywords" content="${path}">
 
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
 
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
 
+    <style>
 
+        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;}
 
+    </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <article class="page-container">
 
 <article class="page-container">

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/sys/list_admin.ftl
查看文件 

@@ -12,7 +12,7 @@
 
     <title>系统管理 - 管理员列表 - Watero-RST 1.0</title>
 
     <title>系统管理 - 管理员列表 - Watero-RST 1.0</title>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 系统管理 <span class="c-gray en">&gt;</span> 管理员列表 <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 系统管理 <span class="c-gray en">&gt;</span> 管理员列表 <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
 <div class="page-container">
 
 <div class="page-container">
 
     <#--<div class="cl pd-5 bg-1 bk-gray mt-20"> <span class="l"><a href="javascript:;" onclick="admin_add('添加管理员','admin-add.html','800','500')" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加管理员</a></span></div>-->
 
     <#--<div class="cl pd-5 bg-1 bk-gray mt-20"> <span class="l"><a href="javascript:;" onclick="admin_add('添加管理员','admin-add.html','800','500')" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加管理员</a></span></div>-->
 
      <table class="table table-border table-bordered table-hover">
 
      <table class="table table-border table-bordered table-hover">