Commit 2f3df1817114f60ae7d6f61ec7aef67c2bacbba4

Authored by xp.Huang
2 parents 7f9ffa34 40c0f52e

Merge branch 'ft' into 'main_dev'

perf(assets/external/headbackground): 移除大标题背景的第7张,线上环境会乱码显示,调整大标题2默认高度和字体大小

See merge request yunteng/thingskit-view!36
... ... @@ -119,7 +119,7 @@ const uploadFileListRef = ref()
119 119
120 120 const selectBgOptions = ref<Array<SelectOption>>([])
121 121
122   -const selectValue = ref('')
  122 +const selectValue = ref('headerBg08')
123 123
124 124 // TODO待封装 成传文件夹名字获取下面所有图片
125 125 const getFetchImages = () => {
... ... @@ -183,10 +183,11 @@ const handleChange = (value: boolean) => {
183 183 const clearImage = () => {
184 184 props.optionData.backgroundImage = ''
185 185 props.optionData.bgSrc = ''
  186 + selectValue.value = ''
186 187 }
187 188 </script>
188 189 <style lang="scss" scoped>
189   -$uploadWidth: 215px;
  190 +// $uploadWidth: 215px;
190 191 $uploadHeight: 193px;
191 192 .upload-box {
192 193 cursor: pointer;
... ... @@ -198,7 +199,7 @@ $uploadHeight: 193px;
198 199 }
199 200 .n-upload-dragger {
200 201 padding: 5px;
201   - width: $uploadWidth;
  202 + // width: $uploadWidth;
202 203 }
203 204 }
204 205 .upload-show {
... ...
... ... @@ -11,10 +11,10 @@ export const option = {
11 11 y: 0,
12 12 w: 1920,
13 13 h: 100,
14   - size: 20,
  14 + size: 40,
15 15 textPos:{
16 16 x: 50,
17   - y: 10,
  17 + y: 30,
18 18 },
19 19 gradient: {
20 20 from: '#0000FFFF',
... ...
... ... @@ -66,7 +66,7 @@ const props = defineProps({
66 66
67 67 //修改默认宽高
68 68 props.chartConfig.attr.w=1920
69   -props.chartConfig.attr.h=180
  69 +props.chartConfig.attr.h=130
70 70
71 71 const { w, h } = toRefs(props.chartConfig.attr)
72 72
... ...
1 1 <template>
2 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 4 <source :src="dataset" />
5 5 </video>
6 6 </div>
... ... @@ -37,6 +37,7 @@ const options: VideoJsPlayerOptions = {
37 37 autoplay: true, // 是否自动播放
38 38 fluid: false, // 自适应宽高
39 39 src: dataset?.value, // 要嵌入的视频源的源 URL
  40 + muted:true,
40 41 userActions: {
41 42 hotkeys: true
42 43 }
... ... @@ -64,6 +65,9 @@ watch(
64 65 props.chartConfig.option.dataset = newData
65 66 videoPlayer?.src(newData)
66 67 videoPlayer?.play()
  68 + },
  69 + {
  70 + immediate: true
67 71 }
68 72 )
69 73 </script>
... ...
... ... @@ -135,15 +135,15 @@ export const useSyncRemote = () => {
135 135
136 136 // * 定时处理
137 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 148 return {
149 149 dataSyncFetch,
... ...