admin
2024-10-15 7e30146cb2238f39a3f6fd68aa27f2e85f85acdd
优化打印
已修改2个文件
18 ■■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/kb/stationTerminal/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java
@@ -29,7 +29,8 @@
     * **/
    @GetMapping("/getOrderInformation")
    public AjaxResult getOrderInformation() {
        Map<String,String> resultMap = new HashMap<>();
        List list = new ArrayList<>();
        Map<String,Object> resultMap = new HashMap<>();
        List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().orderByDesc(OmProductionOrdeInfo::getCreateTime));
        OmProductionOrdeInfo order = orderList.get(0); // 获取最新的一条订单信息
        String workOrderNo = order.getWorkOrderNo();
@@ -37,9 +38,14 @@
                .eq(OmProductionOrdeInfo::getOrderStatus,"3")
                .eq(OmProductionOrdeInfo::getWorkOrderNo,workOrderNo)
        );
        double percent = (double) finishNum.size() / order.getPlanQty() * 100;  // 将百分比表示为小数
        int roundedPercent = (int) Math.round(percent);  // 四舍五入到整数
        list.add(roundedPercent);
        list.add(roundedPercent);
        resultMap.put("workOrderNo",workOrderNo);
        resultMap.put("planQty",order.getPlanQty().toString());
        resultMap.put("actualQty",String.valueOf(finishNum.size()));
        resultMap.put("waterLevel",list);
        return AjaxResult.success(resultMap);
    }
@@ -61,7 +67,7 @@
            lineData.add(omProductionOrdeInfo.getOrderCount());
        }
        map.put("category",category);
        map.put("lineData",lineData);
        map.put("barData",lineData);
        return AjaxResult.success(map);
    }
jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -92,7 +92,7 @@
                     <span>额定功率:</span><span>30kW</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>额定扭矩:</span><span>70N.m</span><br>
                     <span>额定转矩:</span><span>70N.m</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>额定电压:</span><span>336VDC</span><br>
@@ -104,7 +104,7 @@
                     <span>持续工作电流:</span><span>115A</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>相数:</span><span>3</span><br>
                     <span>相数:</span><span style="vertical-align: -0.5px;">3</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>零件号:</span><span>{{printMaterialCode}}</span><br>
@@ -125,13 +125,13 @@
                     <span>最高转速:</span><span>12000rpm</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>防护等级:</span><span>IP67</span><br>
                     <span>防护等级:</span><span style="vertical-align: -0.5px;">I</span><span>P67</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>峰值工作电流:</span><span>230A</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>绝缘等级:</span><span>H</span><br>
                     <span>绝缘等级:</span><span style="vertical-align: -0.5px;">H</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>出厂编号:</span><span>{{headContent.sfcCode}}</span><br>