diff --git a/ruoyi-admin/src/main/resources/static/js/board/week.js b/ruoyi-admin/src/main/resources/static/js/board/week.js index d022f89..86fb932 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/week.js +++ b/ruoyi-admin/src/main/resources/static/js/board/week.js @@ -41,18 +41,18 @@ $(() => { // Tips(data.find(val => val.name === '订单数量').qty, data.find(val => val.name === '完成数量').qty, data.find(val => val.name === '清单率').qty, '#Tips') // }) - autoUpdate("/broad/mtk/mtk_selectOrderInfoBy3dTatle", INTERVAL, data => { + autoUpdate(url+"/selectOrderRateInfoTatle", INTERVAL, data => { Tips(data.find(val => val.name === '订单数量').qty, data.find(val => val.name === '完成数量').qty, data.find(val => val.name === '清单率').qty, '#Tips') }) // 当日订单入库统计 autoUpdate(url + "/zhou_selectQaItemInfo", INTERVAL, data => { let arr = [0, 0, 0, 0, 0, 0] - let yDataOne = [...(data.find(val => val.code == '内胆检漏')?.list.map(val => val.qty) || []), ...arr] - let yDataTwo = [...(data.find(val => val.code == '安全检测')?.list.map(val => val.qty) || []), ...arr] - let yDataThree = [...(data.find(val => val.code == '成品检漏')?.list.map(val => val.qty) || []), ...arr] - let yDataFour = [...(data.find(val => val.code == '测温性能')?.list.map(val => val.qty) || []), ...arr] - let yDataFive = [...(data.find(val => val.code == '成品外观')?.list.map(val => val.qty) || []), ...arr] + let yDataOne = [...(data.find(val => val.code == '内胆检漏')?.list.map(val => val.rate) || []), ...arr] + let yDataTwo = [...(data.find(val => val.code == '安全检测')?.list.map(val => val.rate) || []), ...arr] + let yDataThree = [...(data.find(val => val.code == '成品检漏')?.list.map(val => val.rate) || []), ...arr] + let yDataFour = [...(data.find(val => val.code == '测温性能')?.list.map(val => val.rate) || []), ...arr] + let yDataFive = [...(data.find(val => val.code == '成品外观')?.list.map(val => val.rate) || []), ...arr] multipleBrokenLineAreaDiagramTwo( { xData: data.find(val => val.code == '横坐标')?.list.map(val => val.name), diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js index 049f8b7..d510bf9 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -2161,6 +2161,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => { let option = { tooltip: { trigger: "axis", + // formatter:'{a} {c}%', axisPointer: { lineStyle: { color: "#57617B", @@ -2211,7 +2212,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => { show: false, }, max: max + 1, - min: min, + min: 90, axisLine: { lineStyle: { color: "#57617B",