diff --git a/src/views/intergrationTask/compoments/baseTable.vue b/src/views/intergrationTask/compoments/baseTable.vue index 3a30cdc..0dda555 100644 --- a/src/views/intergrationTask/compoments/baseTable.vue +++ b/src/views/intergrationTask/compoments/baseTable.vue @@ -29,7 +29,7 @@ @selection-change="handleSelectionChange" @select="select" @select-all="selectAll" - style="width: 100%" + style="width: 100%;" :cell-class-name="tableCellName" :height="tableHeight" :max-height="tableMaxHeight" diff --git a/src/views/masterDataOptions/dataOrigin/index.vue b/src/views/masterDataOptions/dataOrigin/index.vue index a7ba3c7..65f9592 100644 --- a/src/views/masterDataOptions/dataOrigin/index.vue +++ b/src/views/masterDataOptions/dataOrigin/index.vue @@ -655,4 +655,10 @@ export default { } } } +::v-deep .el-table{ + max-height: calc(100vh - 230px) !important; +} +::v-deep .el-table__body-wrapper{ + max-height: calc(100vh - 230px) !important; +} diff --git a/vue.config.js b/vue.config.js index 8a53dc3..793933f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -39,9 +39,9 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://hzya.ufyct.com:9067/`, + // target: `http://hzya.ufyct.com:9067/`, // target: `http://127.0.0.1:9081/`, - // target: `http://192.168.2.78:9999`, + target: `http://192.168.2.78:9999`, // target: `http://192.168.2.83:9999`, changeOrigin: true, pathRewrite: {