Merge branch 'fix/teambition/10-12/2024' into 'main_dev'

fix: 云端英文模式下，网关设备的网关子设备界面，红框中应该显示为英文

See merge request yunteng/thingskit-front!1509

@@ -34,6 +34,7 @@ export default {
     },
     },
   },
   },
   template: {
   template: {
+    pushParameter: 'Push parameter',
     templateName: 'Template Name',
     templateName: 'Template Name',
     templateCode: 'Template encoding',
     templateCode: 'Template encoding',
     signName: 'Signature Information',
     signName: 'Signature Information',

@@ -8,8 +8,8 @@ export default {
     email: '邮箱',
     email: '邮箱',
     createButton: '创建告警联系人',
     createButton: '创建告警联系人',
     weChatMessageL: '注意事项:微信通知人必须在thingskit小程序中绑定使用账号,未绑定则接收不到通知',
     weChatMessageL: '注意事项:微信通知人必须在thingskit小程序中绑定使用账号,未绑定则接收不到通知',
-    createAlarm: '@:common.createText 联系人配置',
-    updateAlarm: '@:common.editText 联系人配置',
+    createAlarm: '创建告警联系人',
+    updateAlarm: '编辑告警联系人',
     weChatMessageNew: '企业微信通知电话，须在对应企业微信绑定，否则不能收到告警通知。',
     weChatMessageNew: '企业微信通知电话，须在对应企业微信绑定，否则不能收到告警通知。',
     table: {
     table: {
       title: '告警联系人列表',
       title: '告警联系人列表',

@@ -33,6 +33,7 @@ export default {
     },
     },
   },
   },
   template: {
   template: {
+    pushParameter: '发送参数',
     templateName: '模板名称', //Template Name
     templateName: '模板名称', //Template Name
     templateCode: '模板编码', //模板编码
     templateCode: '模板编码', //模板编码
     signName: '签名', //Signature Information
     signName: '签名', //Signature Information

@@ -2,7 +2,7 @@ export default {
   search: {
   search: {
     name: '配置名称',
     name: '配置名称',
     state: '配置状态',
     state: '配置状态',
-    time: '@:common.createText 时间',
+    time: '创建时间',
     enable: '启用',
     enable: '启用',
     disable: '禁用',
     disable: '禁用',
   },
   },

@@ -37,6 +37,6 @@ export default {
   selectAllText: '全部',
   selectAllText: '全部',
   selectPartText: '部分',
   selectPartText: '部分',
   deviceWithChannelText: '设备和通道号',
   deviceWithChannelText: '设备和通道号',
-  deviceSelectPlaceholderText: '@:common.chooseText 设备',
+  deviceSelectPlaceholderText: '请选择设备',
   channelNumberRuleText: '通道数需要小于50个',
   channelNumberRuleText: '通道数需要小于50个',
 };
 };

@@ -264,5 +264,5 @@ export function getAlarmStatus({
     ? t('monitor.alarm.log.table.confirmed')
     ? t('monitor.alarm.log.table.confirmed')
     : t('monitor.alarm.log.table.unconfirmed');
     : t('monitor.alarm.log.table.unconfirmed');
 
 
-  return `${status} ${ackStatus}`;
+  return `${status}${ackStatus}`;
 }
 }

@@ -4,13 +4,15 @@
       <template #toolbar>
       <template #toolbar>
         <Authority :value="DeviceListAuthEnum.DELETE">
         <Authority :value="DeviceListAuthEnum.DELETE">
           <Popconfirm
           <Popconfirm
-            title="您确定要批量删除数据"
-            ok-text="确定"
-            cancel-text="取消"
+            :title="t('common.batchDeleteConfirmText')"
+            :ok-text="t('common.okText')"
+            :cancel-text="t('common.cancelText')"
             @confirm="handleDelete()"
             @confirm="handleDelete()"
             :disabled="disabledDeleteFlag"
             :disabled="disabledDeleteFlag"
           >
           >
-            <Button danger :disabled="disabledDeleteFlag"> 批量删除 </Button>
+            <Button danger :disabled="disabledDeleteFlag">
+              {{ t('common.batchDeleteText') }}
+            </Button>
           </Popconfirm>
           </Popconfirm>
         </Authority>
         </Authority>
       </template>
       </template>
@@ -23,11 +25,11 @@
         <TableAction
         <TableAction
           :actions="[
           :actions="[
             {
             {
-              label: '删除',
+              label: t('common.delText'),
               auth: DeviceListAuthEnum.DETAIL,
               auth: DeviceListAuthEnum.DETAIL,
               icon: 'ant-design:eye-outlined',
               icon: 'ant-design:eye-outlined',
               popConfirm: {
               popConfirm: {
-                title: '是否确认删除',
+                title: t('common.deleteConfirmText'),
                 confirm: handleDelete.bind(null, record),
                 confirm: handleDelete.bind(null, record),
               },
               },
             },
             },
@@ -48,6 +50,8 @@
   import { DeviceListAuthEnum } from '../../config/device.data';
   import { DeviceListAuthEnum } from '../../config/device.data';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { useI18n } from '/@/hooks/web/useI18n';
+
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceManagement',
     name: 'DeviceManagement',
     components: {
     components: {
@@ -65,6 +69,7 @@
     },
     },
     emits: ['openTbDeviceDetail'],
     emits: ['openTbDeviceDetail'],
     setup(props, { emit }) {
     setup(props, { emit }) {
+      const { t } = useI18n();
       const [registerTable, { getSelectRowKeys, reload, setLoading }] = useTable({
       const [registerTable, { getSelectRowKeys, reload, setLoading }] = useTable({
         api: getChildDevicePage,
         api: getChildDevicePage,
         columns: childDeviceColumns,
         columns: childDeviceColumns,
@@ -83,7 +88,7 @@
         clickToRowSelect: false,
         clickToRowSelect: false,
         actionColumn: {
         actionColumn: {
           width: 200,
           width: 200,
-          title: '操作',
+          title: t('common.operateTable'),
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },
           fixed: 'right',
           fixed: 'right',
         },
         },
@@ -123,7 +128,7 @@
         try {
         try {
           setLoading(true);
           setLoading(true);
           await deleteDevice(ids);
           await deleteDevice(ids);
-          createMessage.success('删除成功');
+          createMessage.success(t('common.deleteSuccessText'));
           reload();
           reload();
         } catch (error) {
         } catch (error) {
           throw error;
           throw error;
@@ -139,6 +144,7 @@
         DeviceListAuthEnum,
         DeviceListAuthEnum,
         handleDelete,
         handleDelete,
         disabledDeleteFlag,
         disabledDeleteFlag,
+        t,
       };
       };
     },
     },
   });
   });

@@ -53,13 +53,10 @@
     </div>
     </div>
     <div class="mt-4" v-if="!isCustomer">
     <div class="mt-4" v-if="!isCustomer">
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">
-        {{ t('common.copyText') }}
-        {{ t('business.deviceText') }}
-        ID
+        {{ t('common.copyText') }}{{ t('business.deviceText') }}ID
       </a-button>
       </a-button>
       <a-button type="primary" class="mr-4" @click="copyDeviceToken">
       <a-button type="primary" class="mr-4" @click="copyDeviceToken">
-        {{ t('common.copyText') }}
-        {{ t('deviceManagement.device.accessTokenText') }}
+        {{ t('common.copyText') }}{{ t('deviceManagement.device.accessTokenText') }}
       </a-button>
       </a-button>
       <Authority value="api:yt:device:equipment">
       <Authority value="api:yt:device:equipment">
         <a-button type="primary" class="mr-4" @click="manageDeviceToken">
         <a-button type="primary" class="mr-4" @click="manageDeviceToken">

@@ -13,7 +13,7 @@ const { t } = useI18n();
 // 表格配置
 // 表格配置
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
-    title: '时间',
+    title: t('common.timeText'),
     dataIndex: 'eventTime',
     dataIndex: 'eventTime',
     format(text) {
     format(text) {
       return formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss');
       return formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss');

 <template>
 <template>
-  <BasicModal v-bind="$attrs" @register="register" title="发送参数" @ok="handleOK">
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    :title="t('monitor.message.template.pushParameter')"
+    @ok="handleOK"
+  >
     <div class="pt-4px pr-4px">
     <div class="pt-4px pr-4px">
       <BasicForm @register="registerForm" />
       <BasicForm @register="registerForm" />
     </div>
     </div>
@@ -217,7 +222,7 @@
         createMessage.success(t('common.sendText'));
         createMessage.success(t('common.sendText'));
       }
       }
 
 
-      return { register, schemas, registerForm, handleOK };
+      return { register, schemas, registerForm, handleOK, t };
     },
     },
   });
   });
 </script>
 </script>