Commit 2f3df1817114f60ae7d6f61ec7aef67c2bacbba4
Merge branch 'ft' into 'main_dev'
perf(assets/external/headbackground): 移除大标题背景的第7张,线上环境会乱码显示,调整大标题2默认高度和字体大小 See merge request yunteng/thingskit-view!36
Showing
6 changed files
with
20 additions
and
15 deletions
src/assets/external/headbackground/headerBg07.png
deleted
100644 → 0
1.8 KB
| @@ -119,7 +119,7 @@ const uploadFileListRef = ref() | @@ -119,7 +119,7 @@ const uploadFileListRef = ref() | ||
| 119 | 119 | ||
| 120 | const selectBgOptions = ref<Array<SelectOption>>([]) | 120 | const selectBgOptions = ref<Array<SelectOption>>([]) |
| 121 | 121 | ||
| 122 | -const selectValue = ref('') | 122 | +const selectValue = ref('headerBg08') |
| 123 | 123 | ||
| 124 | // TODO待封装 成传文件夹名字获取下面所有图片 | 124 | // TODO待封装 成传文件夹名字获取下面所有图片 |
| 125 | const getFetchImages = () => { | 125 | const getFetchImages = () => { |
| @@ -183,10 +183,11 @@ const handleChange = (value: boolean) => { | @@ -183,10 +183,11 @@ const handleChange = (value: boolean) => { | ||
| 183 | const clearImage = () => { | 183 | const clearImage = () => { |
| 184 | props.optionData.backgroundImage = '' | 184 | props.optionData.backgroundImage = '' |
| 185 | props.optionData.bgSrc = '' | 185 | props.optionData.bgSrc = '' |
| 186 | + selectValue.value = '' | ||
| 186 | } | 187 | } |
| 187 | </script> | 188 | </script> |
| 188 | <style lang="scss" scoped> | 189 | <style lang="scss" scoped> |
| 189 | -$uploadWidth: 215px; | 190 | +// $uploadWidth: 215px; |
| 190 | $uploadHeight: 193px; | 191 | $uploadHeight: 193px; |
| 191 | .upload-box { | 192 | .upload-box { |
| 192 | cursor: pointer; | 193 | cursor: pointer; |
| @@ -198,7 +199,7 @@ $uploadHeight: 193px; | @@ -198,7 +199,7 @@ $uploadHeight: 193px; | ||
| 198 | } | 199 | } |
| 199 | .n-upload-dragger { | 200 | .n-upload-dragger { |
| 200 | padding: 5px; | 201 | padding: 5px; |
| 201 | - width: $uploadWidth; | 202 | + // width: $uploadWidth; |
| 202 | } | 203 | } |
| 203 | } | 204 | } |
| 204 | .upload-show { | 205 | .upload-show { |
| @@ -11,10 +11,10 @@ export const option = { | @@ -11,10 +11,10 @@ export const option = { | ||
| 11 | y: 0, | 11 | y: 0, |
| 12 | w: 1920, | 12 | w: 1920, |
| 13 | h: 100, | 13 | h: 100, |
| 14 | - size: 20, | 14 | + size: 40, |
| 15 | textPos:{ | 15 | textPos:{ |
| 16 | x: 50, | 16 | x: 50, |
| 17 | - y: 10, | 17 | + y: 30, |
| 18 | }, | 18 | }, |
| 19 | gradient: { | 19 | gradient: { |
| 20 | from: '#0000FFFF', | 20 | from: '#0000FFFF', |
| @@ -66,7 +66,7 @@ const props = defineProps({ | @@ -66,7 +66,7 @@ const props = defineProps({ | ||
| 66 | 66 | ||
| 67 | //修改默认宽高 | 67 | //修改默认宽高 |
| 68 | props.chartConfig.attr.w=1920 | 68 | props.chartConfig.attr.w=1920 |
| 69 | -props.chartConfig.attr.h=180 | 69 | +props.chartConfig.attr.h=130 |
| 70 | 70 | ||
| 71 | const { w, h } = toRefs(props.chartConfig.attr) | 71 | const { w, h } = toRefs(props.chartConfig.attr) |
| 72 | 72 |
| 1 | <template> | 1 | <template> |
| 2 | <div class="go-content-box" :style="{ width: w + 'px', height: h + 'px' }"> | 2 | <div class="go-content-box" :style="{ width: w + 'px', height: h + 'px' }"> |
| 3 | - <video id="my-player" ref="videoRef" class="video-js my-video vjs-theme-city vjs-big-play-centered"> | 3 | + <video id="my-player" ref="videoRef" class="video-js my-video vjs-theme-city vjs-big-play-centered"> |
| 4 | <source :src="dataset" /> | 4 | <source :src="dataset" /> |
| 5 | </video> | 5 | </video> |
| 6 | </div> | 6 | </div> |
| @@ -37,6 +37,7 @@ const options: VideoJsPlayerOptions = { | @@ -37,6 +37,7 @@ const options: VideoJsPlayerOptions = { | ||
| 37 | autoplay: true, // 是否自动播放 | 37 | autoplay: true, // 是否自动播放 |
| 38 | fluid: false, // 自适应宽高 | 38 | fluid: false, // 自适应宽高 |
| 39 | src: dataset?.value, // 要嵌入的视频源的源 URL | 39 | src: dataset?.value, // 要嵌入的视频源的源 URL |
| 40 | + muted:true, | ||
| 40 | userActions: { | 41 | userActions: { |
| 41 | hotkeys: true | 42 | hotkeys: true |
| 42 | } | 43 | } |
| @@ -64,6 +65,9 @@ watch( | @@ -64,6 +65,9 @@ watch( | ||
| 64 | props.chartConfig.option.dataset = newData | 65 | props.chartConfig.option.dataset = newData |
| 65 | videoPlayer?.src(newData) | 66 | videoPlayer?.src(newData) |
| 66 | videoPlayer?.play() | 67 | videoPlayer?.play() |
| 68 | + }, | ||
| 69 | + { | ||
| 70 | + immediate: true | ||
| 67 | } | 71 | } |
| 68 | ) | 72 | ) |
| 69 | </script> | 73 | </script> |
| @@ -135,15 +135,15 @@ export const useSyncRemote = () => { | @@ -135,15 +135,15 @@ export const useSyncRemote = () => { | ||
| 135 | 135 | ||
| 136 | // * 定时处理 | 136 | // * 定时处理 |
| 137 | const intervalDataSyncUpdate = () => { | 137 | const intervalDataSyncUpdate = () => { |
| 138 | - // 定时获取数据 | ||
| 139 | - const syncTiming = setInterval(() => { | ||
| 140 | - dataSyncUpdate() | ||
| 141 | - }, saveInterval * 1000) | 138 | + // // 定时获取数据 |
| 139 | + // const syncTiming = setInterval(() => { | ||
| 140 | + // dataSyncUpdate() | ||
| 141 | + // }, saveInterval * 1000) | ||
| 142 | 142 | ||
| 143 | - // 销毁 | ||
| 144 | - onUnmounted(() => { | ||
| 145 | - clearInterval(syncTiming) | ||
| 146 | - }) | 143 | + // // 销毁 |
| 144 | + // onUnmounted(() => { | ||
| 145 | + // clearInterval(syncTiming) | ||
| 146 | + // }) | ||
| 147 | } | 147 | } |
| 148 | return { | 148 | return { |
| 149 | dataSyncFetch, | 149 | dataSyncFetch, |