#148 master

Merged
yangxzh1 merged 8 commits from OpenI/octopus:master into master 11 months ago
  1. +1
    -1
      admin-portal/src/views/timeManager/component/consumption.vue
  2. +1
    -1
      admin-portal/src/views/timeManager/component/recharge.vue
  3. BIN
      deploy/charts/octopus/charts/prometheus-node-exporter-4.17.2.tgz
  4. +228
    -1245
      deploy/charts/octopus/templates/grafana.yaml

+ 1
- 1
admin-portal/src/views/timeManager/component/consumption.vue View File

@@ -145,7 +145,7 @@
},
getSearchData(val) {
let data = {}
data = Object.assign(val, { pageIndex: this.searchData.pageIndex, pageSize: this.searchData.pageSize })
data = Object.assign(val, { pageIndex: 1, pageSize: this.searchData.pageSize })
this.getPay(data)
if (val.searchKey) {
this.searchKey = val.searchKey


+ 1
- 1
admin-portal/src/views/timeManager/component/recharge.vue View File

@@ -114,7 +114,7 @@
},
getSearchData(val) {
let data = {}
data = Object.assign(val, { pageIndex: this.searchData.pageIndex, pageSize: this.searchData.pageSize })
data = Object.assign(val, { pageIndex: 1, pageSize: this.searchData.pageSize })
this.Recharge(data)
if (val.searchKey) {
this.searchKey = val.searchKey


BIN
deploy/charts/octopus/charts/prometheus-node-exporter-4.17.2.tgz View File


+ 228
- 1245
deploy/charts/octopus/templates/grafana.yaml
File diff suppressed because it is too large
View File


Loading…
Cancel
Save