From a5c3b7b506b3265db8c788035843f804bd1831de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Tue, 26 Jul 2022 18:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intelligentRefrigeratorInterconnectionFactory.css | 3 ++- .../intelligentRefrigeratorInterconnectionFactory.js | 8 ++++---- ruoyi-admin/src/main/resources/static/js/board/week.js | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css index 6047305..eaffa58 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css +++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css @@ -30,7 +30,8 @@ body { right: 0%; } .arrowsOne{ - display: block; + /*display: block;*/ + display: none; } .arrowsTwo{ display: none; diff --git a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js index 0d0a31e..a3bafe9 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js +++ b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js @@ -17,16 +17,16 @@ $(() => { btnTwo.css({backgroundImage: 'url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png)'}) layerOne.css({display: 'block'}) layerTwo.css({display: 'none'}) - arrowsOne.css({display: 'block'}) - arrowsTwo.css({display: 'none'}) + // arrowsOne.css({display: 'block'}) + // arrowsTwo.css({display: 'none'}) }) btnTwo.click(() => { btnOne.css({backgroundImage: 'url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnOne.png)'}) btnTwo.css({backgroundImage: 'url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwoClick.png)'}) layerOne.css({display: 'none'}) layerTwo.css({display: 'block'}) - arrowsOne.css({display: 'none'}) - arrowsTwo.css({display: 'block'}) + // arrowsOne.css({display: 'none'}) + // arrowsTwo.css({display: 'block'}) }) }) 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 17426b2..b23a239 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/week.js +++ b/ruoyi-admin/src/main/resources/static/js/board/week.js @@ -97,13 +97,13 @@ $(() => { let yDataOne = [] let yDataTwo = [] list.forEach(val => { - yDataOne.push(val.find(val => val.name == '目标')?.qty || 0) + yDataOne.push(val.find(val => val.name == '计划')?.qty || 0) yDataTwo.push(val.find(val => val.name == '产量')?.qty || 0) }) multipleVerticalBarChartTwo({ xName: data.map(val => val.code), yDataOne: yDataOne, - yDataOneName: '目标', + yDataOneName: '计划', yDataTwo: yDataTwo, yDataTwoName: "产量", }, document.getElementById("topLeft"), -20)