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 47ed24d..8c8f2f6 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -1191,12 +1191,13 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { let fontSize = "12"; let lineWidth = 1; let isDataZoom = xValue.length > 3 + let stepSize = 20 let option = { grid: { left: "0%", right: "0%", top: "25%", - bottom: "2%", + bottom: "10%", containLabel: true, }, tooltip: { @@ -1230,7 +1231,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { axisLabel: { color: labelColor, fontSize: fontSize, - margin: 20, + margin: 30, }, axisLine: { show: false, @@ -1321,9 +1322,9 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { // 左侧下内圈 name: "", type: "pictorialBar", - // tooltip: { - // show: false, - // }, + tooltip: { + show: false, + }, symbolSize: [37, 20], symbolOffset: [-39, 20], z: 10, @@ -1336,10 +1337,6 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { }, }, data: hullStoreAmount, - show: function (val) { - console.log(val) - return false - } }, { // 左侧下外圈 @@ -1502,12 +1499,25 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { }; if (isDataZoom) { option.dataZoom.push({ + show:false, type: 'slider', start: 0, - end: 20, + end: stepSize, }) - option.grid.bottom='20%' + 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 + mycharts.setOption(option); + $(window).resize(mycharts.resize); + }, 3000) } + aaa() mycharts.setOption(option); $(window).resize(mycharts.resize); diff --git a/productionboard/src/main/resources/static/js/common/scrollTable.js b/productionboard/src/main/resources/static/js/common/scrollTable.js index 1502923..9520df9 100644 --- a/productionboard/src/main/resources/static/js/common/scrollTable.js +++ b/productionboard/src/main/resources/static/js/common/scrollTable.js @@ -110,7 +110,7 @@ let dynamicTable = resource => { }; const th_tdCSS = { color:'#59B2F6', - // margin: 'auto', + margin: 'auto 0', whiteSpace: 'nowrap', overflow: "hidden", textOverflow: 'ellipsis', diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 8c37afc..7bc3fb6 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -32,7 +32,6 @@ $(() => { dataType: 'JSON', success: function (res) { if (res.length === tableRes.data?.length) return - console.log(res.length +'+'+ tableRes.data?.length); $('#productionPlan').remove() $('.scrollTable').html('
') tableRes.data = res.map(val => [val.prameterName, val.prameterValue, val.createTime,])