diff --git a/public/index.html b/public/index.html index bbf98f3..9973ef0 100644 --- a/public/index.html +++ b/public/index.html @@ -36,13 +36,15 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> <% } %> @@ -63,4 +65,4 @@
- + \ No newline at end of file diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js index 8e26f52..ce63528 100644 --- a/src/mixins/view-module.js +++ b/src/mixins/view-module.js @@ -35,7 +35,10 @@ export default { }, methods: { // 获取数据列表 - getDataList () { + getDataList ( pageReset = true) { + if (pageReset) { + this.page = 1 + } this.dataListLoading = true this.$http.get( this.mixinViewModuleOptions.getDataListURL, @@ -85,7 +88,7 @@ export default { // 分页, 当前页 pageCurrentChangeHandle (val) { this.page = val - this.getDataList() + this.getDataList(false) }, // 新增 / 修改 addOrUpdateHandle (id) { diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue index bdf7e01..ef2299f 100644 --- a/src/views/modules/analysis/user/gridopening.vue +++ b/src/views/modules/analysis/user/gridopening.vue @@ -60,6 +60,7 @@ @selection-change="dataListSelectionChangeHandle" style="width: 100%;">