diff --git a/xiuosiot-frontend/src/views/configuration/development/data.js b/xiuosiot-frontend/src/views/configuration/development/data.js index f16df22..a4364a7 100644 --- a/xiuosiot-frontend/src/views/configuration/development/data.js +++ b/xiuosiot-frontend/src/views/configuration/development/data.js @@ -288,7 +288,7 @@ export const defalutMaterials = [ icon: 't-icon t-text', id: 16, data: { - text: '人机物融合的泛在计算平台', + text: '矽璓工业物联服务', rect: { width: 160, height: 30 diff --git a/xiuosiot-frontend/src/views/data/history/index.vue b/xiuosiot-frontend/src/views/data/history/index.vue index c26857e..edae09e 100644 --- a/xiuosiot-frontend/src/views/data/history/index.vue +++ b/xiuosiot-frontend/src/views/data/history/index.vue @@ -990,16 +990,17 @@ export default { var PM3 = PmArray3[0] var curDate = data[0].dayTime var dataToDisplay = new Array() - for (var i = 0; i < data.length / 3; i++) { + const len = parseInt(data.length / 3) + for (var i = 0; i <= len; i++) { curDate = data[i + 0].dayTime PM1 = this.getValid(data[i + 0].paramsValue, PmArray1[0], PmArray1[1]) PM2 = this.getValid( - data[i + data.length / 3].paramsValue, + data[i + len].paramsValue, PmArray2[0], PmArray2[1] ) PM3 = this.getValid( - data[i + (data.length / 3) * 2].paramsValue, + data[i + len * 2].paramsValue, PmArray3[0], PmArray3[1] ) @@ -1095,7 +1096,8 @@ export default { var Array3 = new Array() var curDate = data[0].dayTime var dataToDisplay = new Array() - for (var i = 0; i < data.length / 3; i++) { + const len = parseInt(data.length / 3) + for (var i = 0; i <= len; i++) { if (i % 3 === 0) { curDate = data[i + 0].dayTime Mix1 = this.getValid( @@ -1104,12 +1106,12 @@ export default { MixArray1[1] ) Mix2 = this.getValid( - data[i + data.length / 3].paramsValue, + data[i + len].paramsValue, MixArray2[0], MixArray2[1] ) Mix3 = this.getValid( - data[i + (data.length / 3) * 2].paramsValue, + data[i + len * 2].paramsValue, MixArray3[0], MixArray3[1] ) diff --git a/xiuosiot-frontend/src/views/login/index.vue b/xiuosiot-frontend/src/views/login/index.vue index c8e76e3..feb0baf 100644 --- a/xiuosiot-frontend/src/views/login/index.vue +++ b/xiuosiot-frontend/src/views/login/index.vue @@ -14,7 +14,7 @@
-

人机物融合的泛在计算平台

+

矽璓工业物联服务