diff --git a/.env b/.env index a7b3826..b7bd75e 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ VUE_APP_VERSION=1.0.0 -VUE_APP_NAME=生态环境监测系统 +VUE_APP_NAME=生态环境监测数据综合分析平台 VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api diff --git a/src/components/ele-admin-pro/packages/ele-pro-table-tools/src/main.vue b/src/components/ele-admin-pro/packages/ele-pro-table-tools/src/main.vue index 0fe82b4..d6c7eb6 100644 --- a/src/components/ele-admin-pro/packages/ele-pro-table-tools/src/main.vue +++ b/src/components/ele-admin-pro/packages/ele-pro-table-tools/src/main.vue @@ -190,6 +190,11 @@ export default { fullScreenTipVisible: false }; }, + watch:{ + columns(val){ + this.orgColumns = val + } + }, computed: { // 表格尺寸下拉选中 selectedKeys() { diff --git a/src/components/ele-admin-pro/packages/ele-pro-table/src/main.vue b/src/components/ele-admin-pro/packages/ele-pro-table/src/main.vue index 6f3bfd1..f2a868d 100644 --- a/src/components/ele-admin-pro/packages/ele-pro-table/src/main.vue +++ b/src/components/ele-admin-pro/packages/ele-pro-table/src/main.vue @@ -479,9 +479,12 @@ export default { }, columns() { this.cols = this.columns; - if (this.toolbar) { + this.$nextTick(()=>{ + if (this.toolbar) { this.$refs.toolbar.initColumnList(); } + }) + }, size() { this.tableSize = this.size; diff --git a/src/views/sound/road/statistic/compare.vue b/src/views/sound/road/statistic/compare.vue index 77273a8..a3f53d1 100644 --- a/src/views/sound/road/statistic/compare.vue +++ b/src/views/sound/road/statistic/compare.vue @@ -1,33 +1,60 @@