From 8d6e221fcdf3142529d4b1d93f3059fd96e2c1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Fri, 17 Jun 2022 17:25:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/common/echarts.common.js | 209 ++++++++++-------- .../main/resources/static/js/foamBox/index.js | 2 +- 2 files changed, 114 insertions(+), 97 deletions(-) diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index 8c8f2f6..62d4d82 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -1174,24 +1174,22 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { const xValue = res.map(val => val.materialName) const lineStoreAmount = res.map(val => val.lineStoreAmount) const hullStoreAmount = res.map(val => val.hullStoreAmount) - hullStoreAmount.forEach((val, index) => { - if (val == 0) { - console.log(val) - hullStoreAmount[index] = 1 - } - }) - lineStoreAmount.forEach((val, index) => { - if (val == 0) { - console.log(val) - lineStoreAmount[index] = 1 - } - }) let lineColor = "#406A92"; let labelColor = "#fff"; let fontSize = "12"; let lineWidth = 1; let isDataZoom = xValue.length > 3 let stepSize = 20 + // hullStoreAmount.forEach((val, index) => { + // if (val == 0) { + // hullStoreAmount[index] = 0 + // } + // }) + // lineStoreAmount.forEach((val, index) => { + // if (val == 0) { + // lineStoreAmount[index] = 0 + // } + // }) let option = { grid: { left: "0%", @@ -1318,46 +1316,59 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { color: "#26B2E8", data: hullStoreAmount, }, - { - // 左侧下内圈 - name: "", - type: "pictorialBar", - tooltip: { - show: false, - }, - symbolSize: [37, 20], - symbolOffset: [-39, 20], - z: 10, - itemStyle: { - normal: { - color: "transparent", - borderColor: "#2EA9E5", - borderType: "solid", - borderWidth: 20, - }, - }, - data: hullStoreAmount, - }, - { - // 左侧下外圈 - name: "", - type: "pictorialBar", - tooltip: { - show: false, - }, - symbolSize: [50, 25], - symbolOffset: [-39, 25], - z: 10, - itemStyle: { - normal: { - color: "transparent", - borderColor: "#26B2E8", - borderType: "solid", - borderWidth: 20, - }, - }, - data: hullStoreAmount, - }, + // { + // // 左侧下内圈 + // name: "", + // type: "pictorialBar", + // tooltip: { + // show: false, + // }, + // symbolSize: function (val) { + // if (val == 0) { + // return [0, 0] + // }else{ + // return [37, 20] + // } + // }, + // symbolOffset: [-39, 20], + // z: 10, + // itemStyle: { + // normal: { + // color: "transparent", + // borderColor: "#2EA9E5", + // borderType: "solid", + // borderWidth: 20, + // }, + // }, + // + // data: hullStoreAmount, + // }, + // { + // // 左侧下外圈 + // name: "", + // type: "pictorialBar", + // tooltip: { + // show: false, + // }, + // symbolSize: function (val) { + // if (val == 0) { + // return [0, 0] + // }else{ + // return [50, 25] + // } + // }, + // symbolOffset: [-39, 25], + // z: 10, + // itemStyle: { + // normal: { + // color: "transparent", + // borderColor: "#26B2E8", + // borderType: "solid", + // borderWidth: 20, + // }, + // }, + // data: hullStoreAmount, + // }, { // 左侧下圆片 name: "", @@ -1418,46 +1429,54 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { color: "#20D3AB", data: lineStoreAmount, }, - { - // 右柱下内圈 - name: "", - type: "pictorialBar", - tooltip: { - show: false, - }, - symbolSize: [37, 20], - symbolOffset: [39, 20], - z: 10, - itemStyle: { - normal: { - color: "transparent", - borderColor: "#20D3AB", - borderType: "solid", - borderWidth: 20, - }, - }, - data: hullStoreAmount, - }, - { - // 右柱下外圈 - name: "", - type: "pictorialBar", - tooltip: { - show: false, - }, - symbolSize: [50, 25], - symbolOffset: [39, 25], - z: 10, - itemStyle: { - normal: { - color: "transparent", - borderColor: "#20D3AB", - borderType: "solid", - borderWidth: 20, - }, - }, - data: hullStoreAmount, - }, + // { + // // 右柱下内圈 + // name: "", + // type: "pictorialBar", + // tooltip: { + // show: false, + // }, + // symbolPosition:'start', + // symbolSize: function (val,data) { + // console.log(val) + // if (!lineStoreAmount[data.dataIndex] > 0) return [0, 0] + // return [37, 20] + // }, + // symbolOffset: [39, 20], + // z: 10, + // itemStyle: { + // normal: { + // color: "transparent", + // borderColor: "#20D3AB", + // borderType: "solid", + // borderWidth: 20, + // }, + // }, + // data: hullStoreAmount, + // }, + // { + // // 右柱下外圈 + // name: "", + // type: "pictorialBar", + // tooltip: { + // show: false, + // }, + // symbolSize: function (val,data) { + // if (!lineStoreAmount[data.dataIndex] > 0) return [0, 0] + // return [50, 25] + // }, + // symbolOffset: [39, 25], + // z: 10, + // itemStyle: { + // normal: { + // color: "transparent", + // borderColor: "#20D3AB", + // borderType: "solid", + // borderWidth: 20, + // }, + // }, + // data: hullStoreAmount, + // }, { // 右柱下圆片 name: "", @@ -1507,9 +1526,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { option.grid.bottom = '20%' } const aaa = () => { - console.log('aaa') setInterval(() => { - console.log(option.dataZoom) option.dataZoom[0].start += stepSize option.dataZoom[0].start = option.dataZoom[0].start % 100 option.dataZoom[0].end = option.dataZoom[0].start + stepSize @@ -2396,7 +2413,7 @@ const energyConsumption = (res, ids) => { itemStyle: { normal: { color: function (params) { - return 'rgb(217,217,217)'; + return 'rgba(40,140,210)'; }, }, }, @@ -2404,7 +2421,7 @@ const energyConsumption = (res, ids) => { show: true, position: "top", textStyle: { - color: "#02C3F1", + color: "#c502f1", }, }, symbolPosition: "end", diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index e28a6a3..a584135 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -72,7 +72,7 @@ $(() => { type: 'value', name: '温度', min: 0, - max: 50, + // max: 50, interval: 10, axisLabel: { formatter: '{value} °C '