wangxiaoming 7 年 前
コミット
c513764ab8

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -66,7 +66,7 @@
             </select>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否翻新机</span>
+            <span class="input-dic" style="margin-top: 0">是否翻新机:</span>
             <label for="radio-10">
                 <input type="radio" id="radio-10" name="isRefurbishment" value="1" checked/>是
             </label>

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

@@ -29,7 +29,7 @@
 					<#--<button type="button" class="my-btn-search" onclick="setting();" style="cursor:pointer; margin-right: 50px;">设置</button>-->
                     <#-- <button type="button" class="my-btn-search" onclick="batch_add_machine('批量添加机器','${path}/admin/machine/_to_add_batch','','550');" style="cursor:pointer; margin-right: 50px;">添加机器</button>
                      &nbsp; &nbsp;-->
-                     <button type="button" class="my-btn-search" onclick="add_renovationmachine('批量添加机器','${path}/admin/machine/_to_add_renovation','560','390');" style="cursor:pointer; margin-right: 50px;">添加翻新机</button>
+                     <button type="button" class="my-btn-search" onclick="add_renovationmachine('批量添加机器','${path}/admin/machine/_to_add_renovation','570','450');" style="cursor:pointer; margin-right: 50px;">添加翻新机</button>
 
 					<input class="my-input" type="text" name="machineBarcode" value="${machineBarcode!''}" placeholder="请输入机器编号"/>
 					<select class="my-select" name="machineIsPrint">

BIN
watero-rst-web/src/main/webapp/common/images/index/admin-login.png


BIN
watero-rst-web/src/main/webapp/common/images/login/admin-login-bg.png


BIN
watero-rst-web/src/main/webapp/common/images/login/admin-loginform-bg.png