diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html index 0991b4f..cbc18a7 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/fp.html +++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html @@ -453,7 +453,7 @@ } // 当班计划/实际产量/当班差异 - autoUpdate('/broad/fp/selectOrderInfo', INTERVAL, data => { + autoUpdate('/broad/fp/selectFpOrderInfo', INTERVAL, data => { // let p = [data[1], data[0][2], data[0][3]] let p = [data.planned_number, data.quantity_number, data.planned_number - data.quantity_number] @@ -461,7 +461,10 @@ updateSplitBlocks(p[i], selectors[i]) } }) - +let a = [ + {name :'当班计划',qty:'123'}, + {name :'实际产量',qty:'123'}, +] // 生产统计数据 autoUpdate('/broad/fp/selectStationHourInfo', INTERVAL, data => { $('#bottom-left').remove() @@ -555,18 +558,18 @@ { xName: data.map(value => value.station_no), yDataOne: data.map(value => value.pol_yl), - yDataOneName: "pol压力", + yDataOneName: "POL压力", yDataTwo: data.map(value => value.so_yl), - yDataTwoName: "so压力", + yDataTwoName: "ISO压力", }, document.getElementById("top-right")) // 右侧温度 multipleBrokenLineAreaDiagram( { xData: data.map(value => value.station_no), yDataOne: data.map(value => value.pol_wd), - yDataOneName: "pol温度", + yDataOneName: "POL温度", yDataTwo: data.map(value => value.so_wd), - yDataTwoName: "so温度", + yDataTwoName: "ISO温度", }, document.getElementById("mid-right")) }) @@ -732,7 +735,7 @@ fontSize: '10px', interval:0, color: '#ffffff', - // rotate:30, + rotate:-30, } }, yAxis: { @@ -907,15 +910,15 @@ const html = ` 箱体发泡线生产数据平台 A1 - B1 - B2 - A2 + A2 + B1 + B2 1#发泡机 2#发泡机 A1 - B1 - A2 - B2 + B2 + B1 + A2 发泡注料压力监控 发泡注料温度监控 `