更新样式

watero-rst-web/src/main/webapp/WEB-INF/views/base/page_util.ftl

@@ -71,7 +71,7 @@
     	</span>
 
         <span class="btn" style="cursor: default;">共<a class="active">${page.pages}</a>页</span>
-        <span class="btn" style="cursor: default;">到<a class="active" style="max-height: 36px;min-height: 34px"><input type="text" id="pageCode" value="${page.pageNo}" class="input-text radius" style="width: 36px;height:22px;text-align: center;" maxlength="3"/></a>页</span>
+        <span class="btn" style="cursor: default;">到&nbsp;<a class="active" style="max-height: 36px;min-height: 34px"><input type="text" id="pageCode" value="${page.pageNo}" class="input-text radius" style="width: 36px;height:22px;text-align: center;" maxlength="3"/></a>&nbsp;页</span>
         <span class="btn btn-lowblue radius"><a href="javascript:_go();" class="active">确定</a></span>
         <a href="#" style="overflow:hidden" class="active"></a>
     </div>

watero-rst-web/src/main/webapp/WEB-INF/views/login.ftl

@@ -46,7 +46,7 @@
             <div class="row">
                 <div class="formControls col-8 col-offset-3">
                     <label for="online">
-                        <input type="checkbox" name="online" id="remember_me" value="">使我保持登录状态</label>
+                        <input type="checkbox" name="online" id="remember_me" value="">&nbsp;&nbsp;使我保持登录状态</label>
                 </div>
             </div>
             <div class="row loginbox_btn">

watero-rst-web/src/main/webapp/WEB-INF/views/order/businessManager_order_list.ftl

@@ -15,7 +15,7 @@
 <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 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;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
     <form action="${path}/admin/order/select_order_list" method="post" id="myForm">
@@ -103,7 +103,7 @@
             <td class="td-manage">
                 <a style="text-decoration:none" href="javascript:;" title="详情"
                    onclick="admin_add_filter('详情','${path}/admin/order/_select_orderApprovalDetails?orderId=${order.orderId!}','','550');">
-                    <i class="Hui-iconfont">&#xe719;</i>
+                    <i class="Hui-iconfont" style="font-size: 20px;">&#xe719;</i>
                 </a>
         </td>
         </tr>

watero-rst-web/src/main/webapp/WEB-INF/views/order/financialManager_order_list.ftl

@@ -121,8 +121,8 @@
 
 
             <td class="td-manage">
-                <button onclick="through('${order.orderId!}');"class="mui-btn mui-btn-s">已付款</button>
-                <button onclick="confirms('${order.orderId!}');" class="mui-btn mui-btn-b">驳回</button>
+                <button onclick="through('${order.orderId!}');"class="btn btn-default">已付款</button>
+                <button onclick="confirms('${order.orderId!}');" class="btn btn-default">驳回</button>
         </td>
         </tr>
         </#list>

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

@@ -7,15 +7,15 @@
     <style>
         .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-input{padding: 5px 10px;width: 60%;}
-        .my-input-date{padding: 5px 10px;width: 60%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
+        .my-input{padding: 8px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-input-date{padding: 8px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
         .input-box{margin: 18px 0;}
         .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>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: 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-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%;}
     </style>
 </head>

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

@@ -10,6 +10,7 @@
 			.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;}
             .barcodeImg{margin:10px 0px}
+            .table-bg thead th{background-color: #e2f6ff;}
 		</style>
 		<#include "/base/list_base.ftl">
 	</head>

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

@@ -44,7 +44,7 @@
 				</thead>
 				<tbody id="listid">
 					<#list machineList as list>
-						<tr >
+						<tr class="text-c">
                             <td width="2">
                                 <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' >
                             </td>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/produce_list.ftl

@@ -12,18 +12,20 @@
     <title>生产产品列表</title>
     <style>
         .chanpin-list{margin: 0;padding: 10px;list-style-type: none;}
-        .chanpin-list>li{float: left;width: 230px;border: 1px solid rgba(0,0,0,.1);background-color: #fff;margin-right: 30px;}
+        .chanpin-list>li{display: table-cell;width: 230px;border-left: 1px solid rgba(0,0,0,.1);border-bottom: 1px solid rgba(0,0,0,.1);background-color: #fff;position: relative;border-right: 30px solid transparent;padding-bottom: 30px;}
+        .chanpin-list>li:after{content: '';position: absolute;right: 0;width: 1px;height: 100%;background-color: #ccc;-webkit-transform:scaleX(.5);  top:0;}
         .chanpin-list>li .title{background-color: #32a3d8;text-align: center;color: #fff;padding: 12px 0;}
         .chanpin-list>li .title>span{padding:3px 3px 3px 28px;background: url(${path}/common/images/pts/jiqi-1.png) left center no-repeat;background-size:auto 80%;}
         .items-list{margin: 0;padding: 20px 25px;list-style: none;}
         .items-list>li{margin: 12px 0;font-size: 13px;position: relative;padding-left: 13px;color: #666;}
         .items-list>li:after{content: '';position: absolute;left: 0;top: 5px;width: 5px;height: 5px;border-radius: 50%;border: 1px solid #32a3d8;}
-        .items-list>li:last-child{text-align: center;margin-top: 50px;padding-left: 0;}
-        .items-list>li:last-child:after{display: none;}
-        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;}
+        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;display: block;
+            width: 100px;
+            left: 50%;
+            position: absolute;bottom: 10px;margin-left: -50px;}
         .chanpin-list>.li-add{width: 230px;height: 280px;text-align: center;display: table;padding-top: 55px;position: relative;cursor:pointer;}
         .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;}
+        .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;}
     </style>
 </head>
@@ -46,15 +48,13 @@
                     <#list produce.process as process>
                         <li>${process.processName!}</li>
                     </#list>
-                    <li>
-                        <button type="button" onclick="updateProduce(${produce.produceId!})" class="my-btn-edit">编辑流程</button>
-                    </li>
                 </ul>
+                <button type="button" onclick="updateProduce(${produce.produceId!})" class="my-btn-edit">编辑流程</button>
             </li>
         </#list>
-            <li class="li-add">
+            <div class="li-add">
                 <div>添加产品</div>
-            </li>
+            </div>
         </ul>
     <div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -11,13 +11,13 @@
     <style>
         .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-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-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;}
-        .my-btn-edit{padding: 6px 20px;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-edit{padding: 6px 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-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;}
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}