diff --git a/src/components/homeComp/curveTableCH4.vue b/src/components/homeComp/curveTableCH4.vue
index 963d602..b54d0b6 100644
--- a/src/components/homeComp/curveTableCH4.vue
+++ b/src/components/homeComp/curveTableCH4.vue
@@ -77,10 +77,11 @@
inside: true
},
type: 'value',
+ name: this.unit,
axisLabel: { // y轴设置为%
show: true,
interval: 'auto',
- formatter: '{value} %'
+ formatter: '{value}'
},
max: 100, // 最大值
min: 0 // 最小值
@@ -108,6 +109,8 @@
if (newVal) {
this.options.xAxis.data = newVal
this.options.series[0].data = this.line
+ const max = Math.floor(Math.max(...this.line) * 1.5)
+ this.options.yAxis.max = max > 10 ? max : 10
this.refreshChart()
}
},
diff --git a/src/components/homeComp/curveTableCH4.vue b/src/components/homeComp/curveTableCH4.vue
index 963d602..b54d0b6 100644
--- a/src/components/homeComp/curveTableCH4.vue
+++ b/src/components/homeComp/curveTableCH4.vue
@@ -77,10 +77,11 @@
inside: true
},
type: 'value',
+ name: this.unit,
axisLabel: { // y轴设置为%
show: true,
interval: 'auto',
- formatter: '{value} %'
+ formatter: '{value}'
},
max: 100, // 最大值
min: 0 // 最小值
@@ -108,6 +109,8 @@
if (newVal) {
this.options.xAxis.data = newVal
this.options.series[0].data = this.line
+ const max = Math.floor(Math.max(...this.line) * 1.5)
+ this.options.yAxis.max = max > 10 ? max : 10
this.refreshChart()
}
},
diff --git a/src/components/homeComp/showConfig.vue b/src/components/homeComp/showConfig.vue
index ce2646b..5503286 100644
--- a/src/components/homeComp/showConfig.vue
+++ b/src/components/homeComp/showConfig.vue
@@ -5,11 +5,11 @@
-
+
-
-
+
+
@@ -110,7 +110,7 @@
},
rules: {
collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
- uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+ uploadCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
retryNum: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
thresholdVol: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/components/homeComp/curveTableCH4.vue b/src/components/homeComp/curveTableCH4.vue
index 963d602..b54d0b6 100644
--- a/src/components/homeComp/curveTableCH4.vue
+++ b/src/components/homeComp/curveTableCH4.vue
@@ -77,10 +77,11 @@
inside: true
},
type: 'value',
+ name: this.unit,
axisLabel: { // y轴设置为%
show: true,
interval: 'auto',
- formatter: '{value} %'
+ formatter: '{value}'
},
max: 100, // 最大值
min: 0 // 最小值
@@ -108,6 +109,8 @@
if (newVal) {
this.options.xAxis.data = newVal
this.options.series[0].data = this.line
+ const max = Math.floor(Math.max(...this.line) * 1.5)
+ this.options.yAxis.max = max > 10 ? max : 10
this.refreshChart()
}
},
diff --git a/src/components/homeComp/showConfig.vue b/src/components/homeComp/showConfig.vue
index ce2646b..5503286 100644
--- a/src/components/homeComp/showConfig.vue
+++ b/src/components/homeComp/showConfig.vue
@@ -5,11 +5,11 @@
-
+
-
-
+
+
@@ -110,7 +110,7 @@
},
rules: {
collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
- uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+ uploadCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
retryNum: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
thresholdVol: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e469807..0dcdb37 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -85,10 +85,8 @@
name: 'Dashboard',
components: {
VideoBox,
- curveTable,
dataTable,
- curveTableCH4,
- curveTableH2S
+ curveTableCH4
},
computed: {
...mapGetters([
@@ -110,31 +108,31 @@
CH4Total: 0,
config24: {
thresholdVol: '1',
- collectInterval: 10,
+ collectInterval: 1,
uploadCycle: '7',
retryNum: '5',
- IP: '192.0.0.1',
- port: '8081',
+ IP: '',
+ port: '',
current: 10,
id: '24'
},
config22: {
thresholdVol: '1',
- collectInterval: 10,
+ collectInterval: 1,
uploadCycle: '7',
retryNum: '5',
- IP: '192.0.0.1',
- port: '8081',
+ IP: '',
+ port: '',
current: 14,
id: '22'
},
config23: {
thresholdVol: '20',
- collectInterval: 10,
+ collectInterval: 1,
uploadCycle: '7',
retryNum: '5',
- IP: '192.0.0.1',
- port: '8081',
+ IP: '',
+ port: '',
current: 30,
id: '23'
},