From ad464096f0983b315e9297d95d269cf6f82bfb7c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 10 十一月 2020 08:25:21 +0800 Subject: [PATCH] Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs --- src/main/webapp/views/crn.html | 8 ++++---- src/main/resources/application.yml | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1a806c2..19167ba 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,7 +12,7 @@ #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs #username: sa #password: eisoft - url: jdbc:sqlserver://localhost:1433;databasename=jsasrs + url: jdbc:sqlserver://192.168.2.250:1433;databasename=jsasrs username: sa password: sa@123 mvc: @@ -63,14 +63,14 @@ bay: 0 lev: 1 # 鍫嗗灈鏈�2 - crn[1]: - id: 1 - ip: 192.168.6.10 - port: 102 - rack: 0 - slot: 0 - # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - offset: 2 +# crn[1]: +# id: 1 +# ip: 192.168.6.10 +# port: 102 +# rack: 0 +# slot: 0 +# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 +# offset: 2 # 杈撻�佺嚎 devp[0]: id: 1 diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html index 306d237..d3f4602 100644 --- a/src/main/webapp/views/crn.html +++ b/src/main/webapp/views/crn.html @@ -109,7 +109,7 @@ </div> <div class="select-container-item"> <span>鎺�</span> - <label><input id="sourceRow" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label> + <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label> </div> <div class="select-container-item"> <span>鍒�</span> @@ -117,7 +117,7 @@ </div> <div class="select-container-item"> <span>灞�</span> - <label><input id="sourceLev" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label> + <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label> </div> </div> </div> @@ -131,7 +131,7 @@ </div> <div class="select-container-item"> <span>鎺�</span> - <label><input id="row" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label> + <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label> </div> <div class="select-container-item"> <span>鍒�</span> @@ -139,7 +139,7 @@ </div> <div class="select-container-item"> <span>灞�</span> - <label><input id="lev" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label> + <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label> </div> </div> </div> -- Gitblit v1.9.1