Commit ee49c236c48595c18d2e71b6fbd12127a9dd7001
1 parent
fa0dbc6e
1、添加锥形柱图
Showing
7 changed files
with
68 additions
and
65 deletions
src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js
| ... | ... | @@ -45,7 +45,7 @@ export const widgetHref = { |
| 45 | 45 | name: 'color', |
| 46 | 46 | required: false, |
| 47 | 47 | placeholder: '', |
| 48 | - value: '#FAD400', | |
| 48 | + value: '#05a8ee', | |
| 49 | 49 | }, |
| 50 | 50 | { |
| 51 | 51 | type: 'el-input-number', |
| ... | ... | @@ -61,7 +61,7 @@ export const widgetHref = { |
| 61 | 61 | name: 'background', |
| 62 | 62 | required: false, |
| 63 | 63 | placeholder: '', |
| 64 | - value: 'rgba(115,170,229,.5)', | |
| 64 | + value: '', | |
| 65 | 65 | }, |
| 66 | 66 | { |
| 67 | 67 | type: 'el-select', |
| ... | ... | @@ -114,7 +114,7 @@ export const widgetHref = { |
| 114 | 114 | name: 'linkAdress', |
| 115 | 115 | required: false, |
| 116 | 116 | placeholder: '', |
| 117 | - value: 'http://www.baidu.com', | |
| 117 | + value: '', | |
| 118 | 118 | }, |
| 119 | 119 | ], |
| 120 | 120 | // 数据 | ... | ... |
src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js
| ... | ... | @@ -54,7 +54,7 @@ export const widgetMarquee = { |
| 54 | 54 | name: 'color', |
| 55 | 55 | required: false, |
| 56 | 56 | placeholder: '', |
| 57 | - value: '#FAD400', | |
| 57 | + value: '#05a8ee', | |
| 58 | 58 | }, |
| 59 | 59 | { |
| 60 | 60 | type: 'el-input-number', |
| ... | ... | @@ -70,7 +70,7 @@ export const widgetMarquee = { |
| 70 | 70 | name: 'background', |
| 71 | 71 | required: false, |
| 72 | 72 | placeholder: '', |
| 73 | - value: 'rgba(115,170,229,.5)', | |
| 73 | + value: '', | |
| 74 | 74 | }, |
| 75 | 75 | { |
| 76 | 76 | type: 'el-select', | ... | ... |
src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
| ... | ... | @@ -74,8 +74,8 @@ export const widgetTable = { |
| 74 | 74 | required: false, |
| 75 | 75 | placeholder: '', |
| 76 | 76 | selectOptions: [ |
| 77 | - {code: 'top', name: '上滚动'}, | |
| 78 | 77 | {code: 'topLoop', name: '上循环滚动'}, |
| 78 | + {code: 'top', name: '上滚动'}, | |
| 79 | 79 | ], |
| 80 | 80 | value: 'topLoop' |
| 81 | 81 | }, |
| ... | ... | @@ -153,7 +153,7 @@ export const widgetTable = { |
| 153 | 153 | name: 'headBackColor', |
| 154 | 154 | require: false, |
| 155 | 155 | placeholder: '', |
| 156 | - value: '#0a73ff', | |
| 156 | + value: '#05a8ee', | |
| 157 | 157 | }, |
| 158 | 158 | ], |
| 159 | 159 | }, | ... | ... |
src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js
| ... | ... | @@ -54,7 +54,7 @@ export const widgetText = { |
| 54 | 54 | name: 'color', |
| 55 | 55 | required: false, |
| 56 | 56 | placeholder: '', |
| 57 | - value: '#FAD400', | |
| 57 | + value: '#05a8ee', | |
| 58 | 58 | }, |
| 59 | 59 | { |
| 60 | 60 | type: 'el-input-number', |
| ... | ... | @@ -70,7 +70,7 @@ export const widgetText = { |
| 70 | 70 | name: 'background', |
| 71 | 71 | required: false, |
| 72 | 72 | placeholder: '', |
| 73 | - value: 'rgba(115,170,229,.0)', | |
| 73 | + value: '', | |
| 74 | 74 | }, |
| 75 | 75 | { |
| 76 | 76 | type: 'el-select', |
| ... | ... | @@ -100,59 +100,7 @@ export const widgetText = { |
| 100 | 100 | value: 'center' |
| 101 | 101 | }, |
| 102 | 102 | ], |
| 103 | - // 数据 | |
| 104 | - // data: [ | |
| 105 | - // { | |
| 106 | - // type: 'el-radio-group', | |
| 107 | - // label: '数据类型', | |
| 108 | - // name: 'dataType', | |
| 109 | - // require: false, | |
| 110 | - // placeholder: '', | |
| 111 | - // selectValue: true, | |
| 112 | - // selectOptions: [ | |
| 113 | - // { | |
| 114 | - // code: 'staticData', | |
| 115 | - // name: '静态数据', | |
| 116 | - // }, | |
| 117 | - // { | |
| 118 | - // code: 'dynamicData', | |
| 119 | - // name: '动态数据', | |
| 120 | - // }, | |
| 121 | - // ], | |
| 122 | - // value: 'staticData', | |
| 123 | - // }, | |
| 124 | - // { | |
| 125 | - // type: 'el-input-number', | |
| 126 | - // label: '刷新时间(毫秒)', | |
| 127 | - // name: 'refreshTime', | |
| 128 | - // relactiveDom: 'dataType', | |
| 129 | - // relactiveDomValue: 'dynamicData', | |
| 130 | - // value: 5000 | |
| 131 | - // }, | |
| 132 | - // { | |
| 133 | - // type: 'el-button', | |
| 134 | - // label: '静态数据', | |
| 135 | - // name: 'staticData', | |
| 136 | - // required: false, | |
| 137 | - // placeholder: '', | |
| 138 | - // relactiveDom: 'dataType', | |
| 139 | - // relactiveDomValue: 'staticData', | |
| 140 | - // value: '文本框', | |
| 141 | - // }, | |
| 142 | - // { | |
| 143 | - // type: 'dycustComponents', | |
| 144 | - // label: '', | |
| 145 | - // name: 'dynamicData', | |
| 146 | - // required: false, | |
| 147 | - // placeholder: '', | |
| 148 | - // relactiveDom: 'dataType', | |
| 149 | - // relactiveDomValue: 'dynamicData', | |
| 150 | - // chartType: 'widget-text', | |
| 151 | - // dictKey: 'TEXT_PROPERTIES', | |
| 152 | - // value: '', | |
| 153 | - // } | |
| 154 | - // ], | |
| 155 | - | |
| 103 | + data:[], | |
| 156 | 104 | // 坐标 |
| 157 | 105 | position: [ |
| 158 | 106 | { | ... | ... |
src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js
| ... | ... | @@ -65,7 +65,7 @@ export const widgetTime = { |
| 65 | 65 | name: 'color', |
| 66 | 66 | required: false, |
| 67 | 67 | placeholder: '', |
| 68 | - value: '#FAD400' | |
| 68 | + value: '#05a8ee' | |
| 69 | 69 | }, |
| 70 | 70 | { |
| 71 | 71 | type: 'vue-color', |
| ... | ... | @@ -73,7 +73,7 @@ export const widgetTime = { |
| 73 | 73 | name: 'background', |
| 74 | 74 | required: false, |
| 75 | 75 | placeholder: '', |
| 76 | - value: 'rgba(115,170,229,.5)' | |
| 76 | + value: '' | |
| 77 | 77 | }, |
| 78 | 78 | { |
| 79 | 79 | type: 'el-select', | ... | ... |
src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js
| ... | ... | @@ -23,6 +23,38 @@ export const widgetVideo = { |
| 23 | 23 | placeholder: '', |
| 24 | 24 | value: 'https://www.w3school.com.cn//i/movie.ogg', |
| 25 | 25 | }, |
| 26 | + // { | |
| 27 | + // type: 'el-switch', | |
| 28 | + // label: '自动播放', | |
| 29 | + // name: 'autoplay', | |
| 30 | + // required: false, | |
| 31 | + // placeholder: '', | |
| 32 | + // value: true | |
| 33 | + // }, | |
| 34 | + // { | |
| 35 | + // type: 'el-switch', | |
| 36 | + // label: '循环播放', | |
| 37 | + // name: 'loop', | |
| 38 | + // required: false, | |
| 39 | + // placeholder: '', | |
| 40 | + // value: true | |
| 41 | + // }, | |
| 42 | + // { | |
| 43 | + // type: 'el-switch', | |
| 44 | + // label: '播放按钮显示', | |
| 45 | + // name: 'controls', | |
| 46 | + // required: false, | |
| 47 | + // placeholder: '', | |
| 48 | + // value: true | |
| 49 | + // }, | |
| 50 | + { | |
| 51 | + type: 'el-switch', | |
| 52 | + label: '静音播放', | |
| 53 | + name: 'muted', | |
| 54 | + required: false, | |
| 55 | + placeholder: '', | |
| 56 | + value: true | |
| 57 | + }, | |
| 26 | 58 | ], |
| 27 | 59 | // 数据 |
| 28 | 60 | data: [], | ... | ... |
src/views/bigscreenDesigner/designer/widget/text/widgetVideo.vue
| 1 | 1 | <template> |
| 2 | - <video :style="styleColor" :src="styleColor.videoAdress" controls="controls"> | |
| 2 | + <video | |
| 3 | + controls="controls" | |
| 4 | + :muted="muted" | |
| 5 | + autoplay="autoplay" | |
| 6 | + loop="loop" | |
| 7 | + :style="styleColor" | |
| 8 | + :src="styleColor.videoAdress" | |
| 9 | + > | |
| 3 | 10 | 您的浏览器不支持 video 标签。 |
| 4 | 11 | </video> |
| 5 | 12 | </template> |
| ... | ... | @@ -18,6 +25,22 @@ export default { |
| 18 | 25 | }; |
| 19 | 26 | }, |
| 20 | 27 | computed: { |
| 28 | + //播放按钮显示 | |
| 29 | + // controls() { | |
| 30 | + // return this.options.setup.controls?"controls":""; | |
| 31 | + // }, | |
| 32 | + // //播放按钮显示 | |
| 33 | + // autoplay() { | |
| 34 | + // return this.options.setup.autoplay?"autoplay":""; | |
| 35 | + // }, | |
| 36 | + //静音 | |
| 37 | + muted() { | |
| 38 | + return this.options.setup.muted?"muted":""; | |
| 39 | + }, | |
| 40 | + //循环 | |
| 41 | + // loop() { | |
| 42 | + // return this.options.setup.loop?"loop":""; | |
| 43 | + // }, | |
| 21 | 44 | transStyle() { |
| 22 | 45 | return this.objToOne(this.options); |
| 23 | 46 | }, | ... | ... |