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 51a96a9..9f1a8ce 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -1530,8 +1530,8 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { //设备OEE统计 const OEEStatistics = (res, ids) => { let mycharts = echarts.init(ids); - let xAxisData = res.map(val => val.yValue); - let yAxisData = res.map(val => val.xValue); + let xAxisData = res.map(val => val.xValue); + let yAxisData = res.map(val => val.yValue); let option = { tooltip: {}, @@ -1637,7 +1637,7 @@ const OEEStatistics = (res, ids) => { show: true, position: "top", textStyle: { - color: "#28ffb3", + color: "rgb(165,122,75)", }, }, itemStyle: { @@ -2124,7 +2124,7 @@ const loss = (res, ids) => { show: true, position: "top", textStyle: { - color: "#02C3F1", + color: barTopColor[0], }, }, symbolPosition: "end", @@ -2181,7 +2181,7 @@ const equipmentFailure = (res, ids) => { grid: { top: '1%', left: '6%', - right: '6%', + right: '15%', bottom: '3%', containLabel: true }, @@ -2256,26 +2256,33 @@ const equipmentFailure = (res, ids) => { }, }, series: [ - { - name: "柱顶部", - type: "pictorialBar", - symbolSize: [6, 13], - symbolOffset: [3, 0], - z: 12, - itemStyle: { - normal: { - color: function (params) { - return "#B78E45"; - }, - }, - }, - symbolPosition: "end", - data: values, - }, + // { + // name: "柱顶部", + // type: "pictorialBar", + // symbolSize: [6, 13], + // symbolOffset: [3, 0], + // z: 12, + // itemStyle: { + // normal: { + // color: function (params) { + // return "#B78E45"; + // }, + // }, + // }, + // symbolPosition: "end", + // data: values, + // }, { name: '2011', type: 'bar', data: values, + label: { + show: true, + position: "right", + textStyle: { + color: '#CCFF66', + }, + }, itemStyle: { normal: { color: function (params) { @@ -2286,7 +2293,7 @@ const equipmentFailure = (res, ids) => { }, { offset: 0, - color: "#B78E45", + color: "#CCFF66", }, ]); }, diff --git a/productionboard/src/main/resources/static/js/common/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js index 74fed55..05b094d 100644 --- a/productionboard/src/main/resources/static/js/common/synthetic.js +++ b/productionboard/src/main/resources/static/js/common/synthetic.js @@ -2,12 +2,12 @@ const dataInformationFunction = (statusArray) => { let info = ` - - + + - - + +
${statusArray[0] == 1 ? `运行正常` : `运行异常`}${statusArray[1]}${statusArray[0] == 1 ? `正常` : `异常`}${statusArray[1]}
${statusArray[2]}kW·h${statusArray[3]}${statusArray[2]}kW·h${statusArray[3]}
`; $("#dataInformation").append(info); @@ -36,8 +36,8 @@ const synthetic = (statusArray) => { - ${statusArray[8] || 0} - ${statusArray[9] || 0} + ${statusArray[8] || 0} + ${statusArray[9] || 0} `; $("#synthetic").append(info); } diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 219e8fd..2e66106 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -5,29 +5,7 @@ $(() => { OEEStatistics(result, document.getElementById("OEEStatistics")); }); setInterval(() => { - let result = [ - { - "createTime": 1654729200000, - "yValue": "07", - "xValue": Math.random() * 3 - }, - { - "createTime": 1654732800000, - "yValue": "08", - "xValue": Math.random() * 3 - }, - { - "createTime": 1654736400000, - "yValue": "09", - "xValue": Math.random() * 3 - }, - { - "createTime": 1654740000000, - "yValue": "10", - "xValue": Math.random() * 3 - } - ] - OEEStatistics(result, document.getElementById("OEEStatistics")); + // OEEStatistics(result, document.getElementById("OEEStatistics")); }, 1000); //设备故障排名 @@ -107,13 +85,13 @@ const dataInformationFunction = (statusArray) => { console.log(res); let info = ` - + - +
${res.deviceStatus == 1 ? `运行正常` : `运行异常`}${res.deviceStatus == 1 ? `正常` : `异常`} ${res.devicePower}kW
${res.deviceEnergy}kW·h22
`; diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 51a96a9..9f1a8ce 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -1530,8 +1530,8 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { //设备OEE统计 const OEEStatistics = (res, ids) => { let mycharts = echarts.init(ids); - let xAxisData = res.map(val => val.yValue); - let yAxisData = res.map(val => val.xValue); + let xAxisData = res.map(val => val.xValue); + let yAxisData = res.map(val => val.yValue); let option = { tooltip: {}, @@ -1637,7 +1637,7 @@ const OEEStatistics = (res, ids) => { show: true, position: "top", textStyle: { - color: "#28ffb3", + color: "rgb(165,122,75)", }, }, itemStyle: { @@ -2124,7 +2124,7 @@ const loss = (res, ids) => { show: true, position: "top", textStyle: { - color: "#02C3F1", + color: barTopColor[0], }, }, symbolPosition: "end", @@ -2181,7 +2181,7 @@ const equipmentFailure = (res, ids) => { grid: { top: '1%', left: '6%', - right: '6%', + right: '15%', bottom: '3%', containLabel: true }, @@ -2256,26 +2256,33 @@ const equipmentFailure = (res, ids) => { }, }, series: [ - { - name: "柱顶部", - type: "pictorialBar", - symbolSize: [6, 13], - symbolOffset: [3, 0], - z: 12, - itemStyle: { - normal: { - color: function (params) { - return "#B78E45"; - }, - }, - }, - symbolPosition: "end", - data: values, - }, + // { + // name: "柱顶部", + // type: "pictorialBar", + // symbolSize: [6, 13], + // symbolOffset: [3, 0], + // z: 12, + // itemStyle: { + // normal: { + // color: function (params) { + // return "#B78E45"; + // }, + // }, + // }, + // symbolPosition: "end", + // data: values, + // }, { name: '2011', type: 'bar', data: values, + label: { + show: true, + position: "right", + textStyle: { + color: '#CCFF66', + }, + }, itemStyle: { normal: { color: function (params) { @@ -2286,7 +2293,7 @@ const equipmentFailure = (res, ids) => { }, { offset: 0, - color: "#B78E45", + color: "#CCFF66", }, ]); }, diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js index 74fed55..05b094d 100644 --- a/productionboard/target/classes/static/js/common/synthetic.js +++ b/productionboard/target/classes/static/js/common/synthetic.js @@ -2,12 +2,12 @@ const dataInformationFunction = (statusArray) => { let info = ` - - + + - - + +
${statusArray[0] == 1 ? `运行正常` : `运行异常`}${statusArray[1]}${statusArray[0] == 1 ? `正常` : `异常`}${statusArray[1]}
${statusArray[2]}kW·h${statusArray[3]}${statusArray[2]}kW·h${statusArray[3]}
`; $("#dataInformation").append(info); @@ -36,8 +36,8 @@ const synthetic = (statusArray) => { - ${statusArray[8] || 0} - ${statusArray[9] || 0} + ${statusArray[8] || 0} + ${statusArray[9] || 0} `; $("#synthetic").append(info); } diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index 219e8fd..2e66106 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -5,29 +5,7 @@ $(() => { OEEStatistics(result, document.getElementById("OEEStatistics")); }); setInterval(() => { - let result = [ - { - "createTime": 1654729200000, - "yValue": "07", - "xValue": Math.random() * 3 - }, - { - "createTime": 1654732800000, - "yValue": "08", - "xValue": Math.random() * 3 - }, - { - "createTime": 1654736400000, - "yValue": "09", - "xValue": Math.random() * 3 - }, - { - "createTime": 1654740000000, - "yValue": "10", - "xValue": Math.random() * 3 - } - ] - OEEStatistics(result, document.getElementById("OEEStatistics")); + // OEEStatistics(result, document.getElementById("OEEStatistics")); }, 1000); //设备故障排名 @@ -107,13 +85,13 @@ const dataInformationFunction = (statusArray) => { console.log(res); let info = ` - + - +
${res.deviceStatus == 1 ? `运行正常` : `运行异常`}${res.deviceStatus == 1 ? `正常` : `异常`} ${res.devicePower}kW
${res.deviceEnergy}kW·h22
`;