|
|
@@ -117,15 +117,11 @@
|
|
|
<table>
|
|
|
<thead>
|
|
|
<tr>
|
|
|
- <th>设备状态</th>
|
|
|
<th>${device.deviceState}</th>
|
|
|
+ <th>${device.deviceWorkState}</th>
|
|
|
</tr>
|
|
|
</thead>
|
|
|
<tbody>
|
|
|
- <tr>
|
|
|
- <td>设备厂家</td>
|
|
|
- <td>${device.factory? device.factory : '未知'}</td>
|
|
|
- </tr>
|
|
|
<tr>
|
|
|
<td>型号</td>
|
|
|
<td>${device.deviceModel? device.deviceModel : '未知'}</td>
|
|
|
@@ -146,6 +142,10 @@
|
|
|
<td>进给速度</td>
|
|
|
<td>${(device.actFeed !== null && device.actFeed !== undefined && device.actFeed !== 'NaN' && device.actFeed !== '') ? device.actFeed : '0'}</td>
|
|
|
</tr>
|
|
|
+ <tr>
|
|
|
+ <td>进给倍率</td>
|
|
|
+ <td>${(device.feedRateOvr !== null && device.feedRateOvr !== undefined && device.feedRateOvr !== 'NaN' && device.feedRateOvr !== '') ? device.feedRateOvr + '%' : '0'}</td>
|
|
|
+ </tr>
|
|
|
</tbody>
|
|
|
</table>
|
|
|
</div>
|
