Commit 14446abd93385660e602e8ebaeb04f232941604c
Merge branch 'fix/DEFECT-2912' into 'main_dev'
fix: 修复视频列表名称拼接了分页数&&国际化视频播放弹窗 See merge request yunteng/thingskit-front!1498
Showing
6 changed files
with
28 additions
and
8 deletions
| ... | ... | @@ -176,4 +176,11 @@ export default { | 
| 176 | 176 | intervalErrorText: 'Please select a time interval', | 
| 177 | 177 | tcpAddressCodeHelpText: | 
| 178 | 178 | 'When TCP gateway sub devices are online, device identification or address codes cannot be modified', | 
| 179 | + videoChannel: { | |
| 180 | + preview: 'Video preview', | |
| 181 | + videoLoadding: 'Video loading...', | |
| 182 | + controlHelp: | |
| 183 | + 'Long press the button to call the API, due to the streaming provided by video streaming media, there is a certain delay, please wait patiently.', | |
| 184 | + console: 'Pan-tilt control', | |
| 185 | + }, | |
| 179 | 186 | }; | ... | ... | 
| ... | ... | @@ -173,4 +173,11 @@ export default { | 
| 173 | 173 | commandIssuance: '命令下发', | 
| 174 | 174 | intervalErrorText: '请选择时间间隔', | 
| 175 | 175 | tcpAddressCodeHelpText: 'tcp网关子设备在线时,不能修改设备标识或地址码', | 
| 176 | + | |
| 177 | + videoChannel: { | |
| 178 | + preview: '视频预览', | |
| 179 | + videoLoadding: '视频加载中...', | |
| 180 | + controlHelp: '长按按钮调用API,由于视频流媒体提供的流,有一定时延,请耐心等待。', | |
| 181 | + console: '云台控制', | |
| 182 | + }, | |
| 176 | 183 | }; | ... | ... | 
| ... | ... | @@ -4,8 +4,8 @@ export default { | 
| 4 | 4 | splitScreenModeText: '分屏模式', | 
| 5 | 5 | listModeText: '列表模式', | 
| 6 | 6 | fullscreenText: '全屏', | 
| 7 | - createConfigurationText: '@:common.createText 视频配置', | |
| 8 | - editConfigurationText: '@:common.editText 视频配置', | |
| 7 | + createConfigurationText: '创建视频配置', | |
| 8 | + editConfigurationText: '编辑视频配置', | |
| 9 | 9 | createStreamConfigurationText: '@:common.createText 流媒体配置', | 
| 10 | 10 | streamConfigurationPlaceholderText: '@:common.chooseText 流媒体配置', | 
| 11 | 11 | ... | ... | 
| ... | ... | @@ -290,7 +290,7 @@ | 
| 290 | 290 | class="video-container-mask pointer-events-none absolute top-0 left-0 z-50 text-lg w-full text-light-50 flex justify-center" | 
| 291 | 291 | style="height: 100%; background-color: rgba(0, 0, 0, 0.5)" | 
| 292 | 292 | > | 
| 293 | - <span>{{ item.name }}{{ pagination.colNumber }}</span> | |
| 293 | + <span>{{ item.name }}</span> | |
| 294 | 294 | </div> | 
| 295 | 295 | </div> | 
| 296 | 296 | </div> | ... | ... | 
| ... | ... | @@ -120,9 +120,11 @@ | 
| 120 | 120 | > | 
| 121 | 121 | <Tooltip> | 
| 122 | 122 | <template #title> | 
| 123 | - 长按按钮调用API,由于视频流媒体提供的流,有一定时延,请耐心等待。 | |
| 123 | + {{ t('deviceManagement.device.videoChannel.controlHelp') }} | |
| 124 | 124 | </template> | 
| 125 | - <label class="validate-dot">云台控制</label> | |
| 125 | + <label class="validate-dot"> | |
| 126 | + {{ t('deviceManagement.device.videoChannel.console') }} | |
| 127 | + </label> | |
| 126 | 128 | <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" /> | 
| 127 | 129 | </Tooltip> | 
| 128 | 130 | ... | ... | 
| ... | ... | @@ -5,7 +5,7 @@ | 
| 5 | 5 | destroyOnClose | 
| 6 | 6 | :height="800" | 
| 7 | 7 | @register="register" | 
| 8 | - title="视频预览" | |
| 8 | + :title="t('deviceManagement.device.videoChannel.preview')" | |
| 9 | 9 | :showOkBtn="false" | 
| 10 | 10 | @cancel="handleCancel" | 
| 11 | 11 | > | 
| ... | ... | @@ -19,8 +19,9 @@ | 
| 19 | 19 | import { BasicModal, useModalInner } from '/@/components/Modal'; | 
| 20 | 20 | import VideoPlayer from './video.vue'; | 
| 21 | 21 | import { VideoCancelModalParamsType } from '/@/views/device/list/cpns/tabs/VideoChannel/config'; | 
| 22 | + import { useI18n } from '/@/hooks/web/useI18n'; | |
| 22 | 23 | const emit = defineEmits(['reloadTable', 'register']); | 
| 23 | - | |
| 24 | + const { t } = useI18n(); | |
| 24 | 25 | const playUrl = ref<Nullable<string>>(); | 
| 25 | 26 | const options = ref<Nullable<VideoCancelModalParamsType>>(); | 
| 26 | 27 | const [register, { setModalProps }] = useModalInner( | 
| ... | ... | @@ -29,7 +30,10 @@ | 
| 29 | 30 | try { | 
| 30 | 31 | playUrl.value = null; | 
| 31 | 32 | options.value = null; | 
| 32 | - setModalProps({ loading: true, loadingTip: '视频加载中...' }); | |
| 33 | + setModalProps({ | |
| 34 | + loading: true, | |
| 35 | + loadingTip: t('deviceManagement.device.videoChannel.videoLoadding'), | |
| 36 | + }); | |
| 33 | 37 | const { url, type, withToken } = await record.getPlayUrl(); | 
| 34 | 38 | playUrl.value = url; | 
| 35 | 39 | options.value = record; | ... | ... |