xuos
/
xiuos_IoT
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

This commit is contained in:
龚祖望 2022-12-08 15:26:25 +08:00
parent 03f5bf4548
commit c8865fb995
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xiuosiot-frontend/src/views/configuration/development/data.js
View File

@ -288,7 +288,7 @@ export const defalutMaterials = [
icon: 't-icon t-text',
id: 16,
data: {
text: '人机物融合的泛在计算平台',
text: '矽璓工业物联服务',
rect: {
width: 160,
height: 30

14
xiuosiot-frontend/src/views/data/history/index.vue
View File

@ -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]
)

2
xiuosiot-frontend/src/views/login/index.vue
View File

@ -14,7 +14,7 @@
<img src="@/assets/images/logo.png">
</div>
<div class="title-container">
<h3 class="title">人机物融合的泛在计算平台</h3>
<h3 class="title">矽璓工业物联服务</h3>
</div>
<el-form-item prop="username">