Merge remote-tracking branch 'origin/master'

src/main/resources/static/admin/bigScreen/index.html

@@ -188,20 +188,20 @@
                                     <td>${device.deviceModel? device.deviceModel : '未知'}</td>
                                 </tr>
                                     <td>主程序号</td>
-                                    <td>${device.mainProg}</td>
+                                    <td>${(device.mainProg !== null && device.mainProg !== undefined && device.mainProg !== 'NaN' && device.mainProg !== '') ? device.mainProg : ''}</td>
                                 </tr>
                                 <tr>
                                     <td>主轴转速</td>
-                                    <td>${device.actSpindle}</td>
+                                    <td>${(device.actSpindle !== null && device.actSpindle !== undefined && device.actSpindle !== 'NaN' && device.actSpindle !== '') ? device.actSpindle + '%' : '0'}</td>
                                 </tr>
                                 <tr>
                                     <td>主轴倍率</td>
-                                    <td>${device.spindleMagnification}%</td>
+                                    <td>${(device.spindleMagnification !== null && device.spindleMagnification !== undefined && device.spindleMagnification !== 'NaN' && device.spindleMagnification !== '') ? device.spindleMagnification + '%' : '0'}</td>
                                 </tr>
 
                                 <tr>
                                     <td>进给速度</td>
-                                    <td>${device.actFeed}</td>
+                                    <td>${(device.actFeed !== null && device.actFeed !== undefined && device.actFeed !== 'NaN' && device.actFeed !== '') ? device.actFeed + '%' : '0'}</td>
                                 </tr>
                                 </tbody>
                             </table>

src/main/resources/static/admin/bigScreenDetail/index.html

@@ -52,7 +52,7 @@
                     <th>主轴进给率</th>
                     <th>主轴倍率</th>
                     <th>主轴转速</th>
-                    <th>开机时长</th>
+                    <th>开机总时长</th>
                 </tr>
                 </thead>
                 <tbody class="b_right_box_tbody">
@@ -177,7 +177,7 @@
                         <div class="t_b_box3">
                             <span>当日开机时长</span>
                             <i></i>
-                            <h2>${data.todayPowerOnTime}</h2>
+                            <h2>${data.todayPowerOnTime}M</h2>
                         </div>
                     </main>
                     <img class="t_r_line" src="img/right_line.png" alt="">

src/main/resources/static/admin/css/index.css

@@ -1,7 +1,7 @@
 .data_content{
     /*overflow-x: hidden;*/
     min-width: 1366px;
-    padding-top: 20px;
+    /*padding-top: 20px;*/
     padding-bottom: 20px;
 }
 .data_content .data_time{
@@ -335,14 +335,14 @@
 
 }
 .data_content .data_bottom .bottom_1{
-    width: 24%;
-    height: 280px;
+    width: 19%;
+    height: 250px;
     position: relative;
     box-sizing: border-box;
     border: 1px solid #2C58A6;
     box-shadow: 0 0 10px #2C58A6;
     margin-left: 15px;
-    margin-top: 50px;
+    margin-top: 30px;
 }
 .data_content .data_bottom .bottom_center{
     width: 52%;