diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js index 905aeee..5218355 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js @@ -45,7 +45,7 @@ export const widgetHref = { name: 'color', required: false, placeholder: '', - value: '#FAD400', + value: '#05a8ee', }, { type: 'el-input-number', @@ -61,7 +61,7 @@ export const widgetHref = { name: 'background', required: false, placeholder: '', - value: 'rgba(115,170,229,.5)', + value: '', }, { type: 'el-select', @@ -114,7 +114,7 @@ export const widgetHref = { name: 'linkAdress', required: false, placeholder: '', - value: 'http://www.baidu.com', + value: '', }, ], // 数据 diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js index 14e683c..e0684f7 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js @@ -54,7 +54,7 @@ export const widgetMarquee = { name: 'color', required: false, placeholder: '', - value: '#FAD400', + value: '#05a8ee', }, { type: 'el-input-number', @@ -70,7 +70,7 @@ export const widgetMarquee = { name: 'background', required: false, placeholder: '', - value: 'rgba(115,170,229,.5)', + value: '', }, { type: 'el-select', diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js index ea67c25..3e922e0 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js @@ -74,8 +74,8 @@ export const widgetTable = { required: false, placeholder: '', selectOptions: [ - {code: 'top', name: '上滚动'}, {code: 'topLoop', name: '上循环滚动'}, + {code: 'top', name: '上滚动'}, ], value: 'topLoop' }, @@ -153,7 +153,7 @@ export const widgetTable = { name: 'headBackColor', require: false, placeholder: '', - value: '#0a73ff', + value: '#05a8ee', }, ], }, diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js index 3364079..6d47d57 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js @@ -54,7 +54,7 @@ export const widgetText = { name: 'color', required: false, placeholder: '', - value: '#FAD400', + value: '#05a8ee', }, { type: 'el-input-number', @@ -70,7 +70,7 @@ export const widgetText = { name: 'background', required: false, placeholder: '', - value: 'rgba(115,170,229,.0)', + value: '', }, { type: 'el-select', @@ -100,59 +100,7 @@ export const widgetText = { value: 'center' }, ], - // 数据 - // data: [ - // { - // type: 'el-radio-group', - // label: '数据类型', - // name: 'dataType', - // require: false, - // placeholder: '', - // selectValue: true, - // selectOptions: [ - // { - // code: 'staticData', - // name: '静态数据', - // }, - // { - // code: 'dynamicData', - // name: '动态数据', - // }, - // ], - // value: 'staticData', - // }, - // { - // type: 'el-input-number', - // label: '刷新时间(毫秒)', - // name: 'refreshTime', - // relactiveDom: 'dataType', - // relactiveDomValue: 'dynamicData', - // value: 5000 - // }, - // { - // type: 'el-button', - // label: '静态数据', - // name: 'staticData', - // required: false, - // placeholder: '', - // relactiveDom: 'dataType', - // relactiveDomValue: 'staticData', - // value: '文本框', - // }, - // { - // type: 'dycustComponents', - // label: '', - // name: 'dynamicData', - // required: false, - // placeholder: '', - // relactiveDom: 'dataType', - // relactiveDomValue: 'dynamicData', - // chartType: 'widget-text', - // dictKey: 'TEXT_PROPERTIES', - // value: '', - // } - // ], - + data:[], // 坐标 position: [ { diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js index 9779698..337bad8 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js @@ -65,7 +65,7 @@ export const widgetTime = { name: 'color', required: false, placeholder: '', - value: '#FAD400' + value: '#05a8ee' }, { type: 'vue-color', @@ -73,7 +73,7 @@ export const widgetTime = { name: 'background', required: false, placeholder: '', - value: 'rgba(115,170,229,.5)' + value: '' }, { type: 'el-select', diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js index 9910b03..1e48aa5 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js @@ -23,6 +23,38 @@ export const widgetVideo = { placeholder: '', value: 'https://www.w3school.com.cn//i/movie.ogg', }, + // { + // type: 'el-switch', + // label: '自动播放', + // name: 'autoplay', + // required: false, + // placeholder: '', + // value: true + // }, + // { + // type: 'el-switch', + // label: '循环播放', + // name: 'loop', + // required: false, + // placeholder: '', + // value: true + // }, + // { + // type: 'el-switch', + // label: '播放按钮显示', + // name: 'controls', + // required: false, + // placeholder: '', + // value: true + // }, + { + type: 'el-switch', + label: '静音播放', + name: 'muted', + required: false, + placeholder: '', + value: true + }, ], // 数据 data: [], diff --git a/src/views/bigscreenDesigner/designer/widget/text/widgetVideo.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetVideo.vue index b6569c2..7b7fa18 100644 --- a/src/views/bigscreenDesigner/designer/widget/text/widgetVideo.vue +++ b/src/views/bigscreenDesigner/designer/widget/text/widgetVideo.vue @@ -1,5 +1,12 @@ @@ -18,6 +25,22 @@ export default { }; }, computed: { + //播放按钮显示 + // controls() { + // return this.options.setup.controls?"controls":""; + // }, + // //播放按钮显示 + // autoplay() { + // return this.options.setup.autoplay?"autoplay":""; + // }, + //静音 + muted() { + return this.options.setup.muted?"muted":""; + }, + //循环 + // loop() { + // return this.options.setup.loop?"loop":""; + // }, transStyle() { return this.objToOne(this.options); },