diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 750d745b..5aed4c27 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -863,62 +863,62 @@ const widgetTools = [ ], }, }, - { - code: 'widget-table', - type: 'html', - label: '表格', - icon: 'iconbiaoge', - options: { - setup: [ - { - type: 'el-input-text', - label: '图层名称', - name: 'layerName', - required: false, - placeholder: '', - value: '表格', - }, - { - type: 'dynamic-add-table', - } - ], - data: [], - position: [ - { - type: 'el-input-number', - label: '左边距', - name: 'left', - required: false, - placeholder: 'px', - value: 0, - }, - { - type: 'el-input-number', - label: '上边距', - name: 'top', - required: false, - placeholder: 'px', - value: 0, - }, - { - type: 'el-input-number', - label: '宽度', - name: 'width', - required: false, - placeholder: '该容器在1920px大屏中的宽度', - value: 600, - }, - { - type: 'el-input-number', - label: '高度', - name: 'height', - required: false, - placeholder: '该容器在1080px大屏中的高度', - value: 300, - }, - ] - } - }, + // { + // code: 'widget-table', + // type: 'html', + // label: '表格', + // icon: 'iconbiaoge', + // options: { + // setup: [ + // { + // type: 'el-input-text', + // label: '图层名称', + // name: 'layerName', + // required: false, + // placeholder: '', + // value: '表格', + // }, + // { + // type: 'dynamic-add-table', + // } + // ], + // data: [], + // position: [ + // { + // type: 'el-input-number', + // label: '左边距', + // name: 'left', + // required: false, + // placeholder: 'px', + // value: 0, + // }, + // { + // type: 'el-input-number', + // label: '上边距', + // name: 'top', + // required: false, + // placeholder: 'px', + // value: 0, + // }, + // { + // type: 'el-input-number', + // label: '宽度', + // name: 'width', + // required: false, + // placeholder: '该容器在1920px大屏中的宽度', + // value: 600, + // }, + // { + // type: 'el-input-number', + // label: '高度', + // name: 'height', + // required: false, + // placeholder: '该容器在1080px大屏中的高度', + // value: 300, + // }, + // ] + // } + // }, { code: 'widget-iframe', type: 'html', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue index 729a5044..2755dadc 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue @@ -14,6 +14,7 @@ :index="index" @focus="handleFocus" @blur="handleBlur" + :z-index="index" > diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue index de40c554..410d3db2 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -15,6 +15,12 @@