diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index 78343be..7add5ea 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -326,7 +326,7 @@ export default { return this.$router.push({ name: "pms-reportPreview", query: { - name: data, + name: data.name, }, }); } @@ -336,10 +336,9 @@ export default { return this.$router.push({ name: "pms-reportDesign", query: { - name: data, + name: data.name, }, }); - break; } } }, diff --git a/src/views/modules/pms/reportDesign/index.vue b/src/views/modules/pms/reportDesign/index.vue index 189fd05..934b590 100644 --- a/src/views/modules/pms/reportDesign/index.vue +++ b/src/views/modules/pms/reportDesign/index.vue @@ -1,5 +1,5 @@ - + diff --git a/src/views/modules/pms/reportSheet/config.js b/src/views/modules/pms/reportSheet/config.js index 0507b05..89cb8f4 100644 --- a/src/views/modules/pms/reportSheet/config.js +++ b/src/views/modules/pms/reportSheet/config.js @@ -35,7 +35,7 @@ const CategoryList = { // console.log('【报表分类】', item.value) childOptions.push(h("el-option", { props: { label: item.label, value: item.value } }, null)); }); - return h("el-select", { props: { value: this.pickedId }, on: { change: this.handleChange } }, childOptions); + return h("el-select", { props: { size: 'small', value: this.pickedId }, on: { change: this.handleChange } }, childOptions); }, }; @@ -59,8 +59,8 @@ export default function () { width: 240, subcomponent: TableOperaionComponent, options: [ - { name: "preview", permission: "pms:reportSheet:preview" }, - { name: "design", permission: "pms:reportSheet:design" }, + { name: "preview", emitFull: true, permission: "pms:reportSheet:preview" }, + { name: "design", emitFull: true, permission: "pms:reportSheet:design" }, "edit", { name: "delete", emitFull: true, permission: "pms:reportSheet:delete" }, ], diff --git a/vue.config.js b/vue.config.js index 208151c..6bd0eb4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,6 +25,11 @@ module.exports = { overlay: { errors: true, warnings: true + }, + proxy: { + '/pms-am/ureport/preview': { + target: 'http://192.168.1.62:8080/' // TODO: 线上发布时需修改此处 + } } } }