src/main/webapp/static/css/crn.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/crn.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/webapp/static/css/crn.css
@@ -3,7 +3,7 @@ background-color: #f1f1f1; } /* 第一模块 */ /* -------------------- 第一模块 -------------------- */ .log-board { background-color: #fff; border-radius: 5px; @@ -73,7 +73,7 @@ background: #F5FAFA; } /* 第二模块 */ /* -------------------- 第二模块 -------------------- */ .crn-msg { overflow: hidden; margin-top: 10px; @@ -105,7 +105,7 @@ background: #fff; } /* 第三模块 */ /* -------------------- 第三模块 -------------------- */ .crn-operation { margin-top: 10px; height: 25%; @@ -118,7 +118,6 @@ .task-select { height: 50%; overflow: hidden; border-bottom: 1px solid #d1d1d1; padding: 20px 0px 10px 30px; } .operator-item { @@ -165,11 +164,55 @@ padding: 0 10px; } .select-container-item input { border: 1px solid #8D8D8D; border-radius: 3px; width: 80px; outline: none; } /* 第四模块 */ /* 任务作业选择框 */ .task-operator { height: 50%; overflow: hidden; padding: 0 20px 10px 20px; } .task-operator fieldset { padding: 5px 20px; border-width: 1px; border-style: solid; height: 100%; } .task-operator legend { margin-left: 20px; padding: 0 10px; font-size: 16px; font-weight: 300; } .button-group { margin-top: 10px; margin-left: 30px; } button.item { border: 1px solid #333; font-size: 13px; padding: 1px 1px 1px 1px; width: 100px; height: 40px; outline: none; cursor: pointer; color: #333; background-color: transparent; margin-right: 5px; border-radius: 5px; } button.item:hover { background-color: #333; color: #fff; } /* -------------------- 第四模块 -------------------- */ .crn-output-board { /*padding: 10px;*/ margin-top: 10px; height: 23%; background-color: #fff; @@ -177,7 +220,10 @@ box-shadow: 0 0 3px rgba(0,0,0,.3); } #crn-output { border: 1px solid #b9b9b9; border-left: none; border-right: none; border-top: 1px solid #9d9d9d; border-bottom: 1px solid #333; width: 100%; height: 100%; overflow: auto; src/main/webapp/views/crn.html
@@ -12,12 +12,6 @@ <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script> <style> /* 任务作业选择框 */ .task-operator { height: 50%; overflow: hidden; } </style> </head> <body> @@ -106,15 +100,15 @@ </div> <div class="select-container-item"> <span>排</span> <label><input type="number" name="points" min="0" /></label> <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label> </div> <div class="select-container-item"> <span>列</span> <label><input type="number" name="points" min="0" /></label> <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label> </div> <div class="select-container-item"> <span>层</span> <label><input type="number" name="points" min="0" /></label> <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label> </div> </div> </div> @@ -128,15 +122,15 @@ </div> <div class="select-container-item"> <span>排</span> <label><input type="number" name="points" min="0" /></label> <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label> </div> <div class="select-container-item"> <span>列</span> <label><input type="number" name="points" min="0" /></label> <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label> </div> <div class="select-container-item"> <span>层</span> <label><input type="number" name="points" min="0" /></label> <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label> </div> </div> </div> @@ -144,7 +138,21 @@ <!-- 设备任务操作 --> <div class="task-operator"> <fieldset> <legend>手动操作</legend> <div class="button-group"> <button class="item">入库</button> <button class="item">出库</button> <button class="item">库位转移</button> <button class="item">站到站</button> <button class="item">坐标移动</button> <button class="item">回原点</button> <button class="item">任务完成</button> <button class="item">暂停</button> <button class="item">启动</button> <button class="item">清除命令</button> </div> </fieldset> </div> </div>