Merge branch 'main_dev' into perf/openapi/24-10-09

@@ -176,4 +176,11 @@ export default {
   intervalErrorText: 'Please select a time interval',
   intervalErrorText: 'Please select a time interval',
   tcpAddressCodeHelpText:
   tcpAddressCodeHelpText:
     'When TCP gateway sub devices are online, device identification or address codes cannot be modified',
     'When TCP gateway sub devices are online, device identification or address codes cannot be modified',
+  videoChannel: {
+    preview: 'Video preview',
+    videoLoadding: 'Video loading...',
+    controlHelp:
+      '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.',
+    console: 'Pan-tilt control',
+  },
 };
 };

@@ -173,4 +173,11 @@ export default {
   commandIssuance: '命令下发',
   commandIssuance: '命令下发',
   intervalErrorText: '请选择时间间隔',
   intervalErrorText: '请选择时间间隔',
   tcpAddressCodeHelpText: 'tcp网关子设备在线时，不能修改设备标识或地址码',
   tcpAddressCodeHelpText: 'tcp网关子设备在线时，不能修改设备标识或地址码',
+
+  videoChannel: {
+    preview: '视频预览',
+    videoLoadding: '视频加载中...',
+    controlHelp: '长按按钮调用API，由于视频流媒体提供的流，有一定时延，请耐心等待。',
+    console: '云台控制',
+  },
 };
 };

@@ -4,8 +4,8 @@ export default {
   splitScreenModeText: '分屏模式',
   splitScreenModeText: '分屏模式',
   listModeText: '列表模式',
   listModeText: '列表模式',
   fullscreenText: '全屏',
   fullscreenText: '全屏',
-  createConfigurationText: '@:common.createText 视频配置',
-  editConfigurationText: '@:common.editText 视频配置',
+  createConfigurationText: '创建视频配置',
+  editConfigurationText: '编辑视频配置',
   createStreamConfigurationText: '@:common.createText 流媒体配置',
   createStreamConfigurationText: '@:common.createText 流媒体配置',
   streamConfigurationPlaceholderText: '@:common.chooseText 流媒体配置',
   streamConfigurationPlaceholderText: '@:common.chooseText 流媒体配置',
 
 

@@ -290,7 +290,7 @@
                       class="video-container-mask pointer-events-none absolute top-0 left-0 z-50 text-lg w-full text-light-50 flex justify-center"
                       class="video-container-mask pointer-events-none absolute top-0 left-0 z-50 text-lg w-full text-light-50 flex justify-center"
                       style="height: 100%; background-color: rgba(0, 0, 0, 0.5)"
                       style="height: 100%; background-color: rgba(0, 0, 0, 0.5)"
                     >
                     >
-                      <span>{{ item.name }}{{ pagination.colNumber }}</span>
+                      <span>{{ item.name }}</span>
                     </div>
                     </div>
                   </div>
                   </div>
                 </div>
                 </div>

@@ -120,9 +120,11 @@
     >
     >
       <Tooltip>
       <Tooltip>
         <template #title>
         <template #title>
-          长按按钮调用API，由于视频流媒体提供的流，有一定时延，请耐心等待。
+          {{ t('deviceManagement.device.videoChannel.controlHelp') }}
         </template>
         </template>
-        <label class="validate-dot">云台控制</label>
+        <label class="validate-dot">
+          {{ t('deviceManagement.device.videoChannel.console') }}
+        </label>
         <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
         <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
       </Tooltip>
       </Tooltip>
 
 

@@ -5,7 +5,7 @@
     destroyOnClose
     destroyOnClose
     :height="800"
     :height="800"
     @register="register"
     @register="register"
-    title="视频预览"
+    :title="t('deviceManagement.device.videoChannel.preview')"
     :showOkBtn="false"
     :showOkBtn="false"
     @cancel="handleCancel"
     @cancel="handleCancel"
   >
   >
@@ -19,8 +19,9 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import VideoPlayer from './video.vue';
   import VideoPlayer from './video.vue';
   import { VideoCancelModalParamsType } from '/@/views/device/list/cpns/tabs/VideoChannel/config';
   import { VideoCancelModalParamsType } from '/@/views/device/list/cpns/tabs/VideoChannel/config';
+  import { useI18n } from '/@/hooks/web/useI18n';
   const emit = defineEmits(['reloadTable', 'register']);
   const emit = defineEmits(['reloadTable', 'register']);
-
+  const { t } = useI18n();
   const playUrl = ref<Nullable<string>>();
   const playUrl = ref<Nullable<string>>();
   const options = ref<Nullable<VideoCancelModalParamsType>>();
   const options = ref<Nullable<VideoCancelModalParamsType>>();
   const [register, { setModalProps }] = useModalInner(
   const [register, { setModalProps }] = useModalInner(
@@ -29,7 +30,10 @@
       try {
       try {
         playUrl.value = null;
         playUrl.value = null;
         options.value = null;
         options.value = null;
-        setModalProps({ loading: true, loadingTip: '视频加载中...' });
+        setModalProps({
+          loading: true,
+          loadingTip: t('deviceManagement.device.videoChannel.videoLoadding'),
+        });
         const { url, type, withToken } = await record.getPlayUrl();
         const { url, type, withToken } = await record.getPlayUrl();
         playUrl.value = url;
         playUrl.value = url;
         options.value = record;
         options.value = record;