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

fix: 创建产品时，把默认修改为默认（HTTP、MQTT、COAP） See merge request yunteng/thingskit-front!1511

Merge branch 'fix/teambition/10-16/2024' into 'main_dev'
fix: 创建产品时，把默认修改为默认（HTTP、MQTT、COAP） See merge request yunteng/thingskit-front!1511
xp.Huang
2 parents 765b5b97 b38bb164
Showing 5 changed files with 14 additions and 15 deletions
src/locales/lang/zh-CN/deviceManagement/product.ts
src/locales/lang/zh-CN/video/configuration.ts
src/views/camera/manage/config.data.ts
src/views/device/profiles/step/PhysicalModelManagementStep.vue
src/views/system/scheduled/index.vue
--- a/src/locales/lang/zh-CN/deviceManagement/product.ts
View file @0bdf4fa
+++ b/src/locales/lang/zh-CN/deviceManagement/product.ts
View file @0bdf4fa
@@ -2,7 +2,7 @@ export default {
   createText: '创建产品',
   importText: '导入产品',
   exportText: '导出',
-  defaultText: '默认',
+  defaultText: '默认（HTTP、MQTT、COAP）',
   productListText: '产品列表',
   defaultSettingSuccessText: '设置默认成功',
   defaultSettingFailedText: '设置默认失败',
@@ -28,11 +28,11 @@ export default {
   telemetryDataSubjectFilterText: '遥测数据主题筛选器	',
   attributeTopicFilterText: '属性主题过滤器',
   testScriptText: '测试脚本',
-  hexLengthText: 'Hex长度',
+  hexLengthText: 'HEX长度',
   splicePositionText: '截取起止位置',
   splicePositionHelpMessageText: '截取示例："ABCD".substring(0,2) 截取后的值为"AB"',
   inputSpliceStartPositionText: '请输入截取起止位置',
-  splicePositionValidText: '截取起始位置大与截取结束位置',
+  splicePositionValidText: '截取起始位置大于截取结束位置',
   spliceLengthValidText: '截取起止位置大与HEX长度',
   inputStartPositionText: '请输入起始位置',
   inputEndPositionText: '请输入截止位置',
@@ -197,7 +197,7 @@ export default {
   downlinkScriptRuleText: '@:common.chooseText@:deviceManagement.downlinkScriptText',
   typeText: '类型',
   scriptRuleText: '请选择对应的脚本',
-  createCoversionScriptText: '@:common.createText 转换脚本',
+  createCoversionScriptText: '创建转换脚本',
   configurationTypeText: '配置类型',
   defaultConfigurationText: '默认配置',
   selectCategory: '选择品类',
--- a/src/locales/lang/zh-CN/video/configuration.ts
View file @0bdf4fa
+++ b/src/locales/lang/zh-CN/video/configuration.ts
View file @0bdf4fa
@@ -6,8 +6,8 @@ export default {
   fullscreenText: '全屏',
   createConfigurationText: '创建视频配置',
   editConfigurationText: '编辑视频配置',
-  createStreamConfigurationText: '@:common.createText 流媒体配置',
-  streamConfigurationPlaceholderText: '@:common.chooseText 流媒体配置',
+  createStreamConfigurationText: '创建流媒体配置',
+  streamConfigurationPlaceholderText: '请选择流媒体配置',
   avatarText: '视频封面',
   videoNameText: '视频名字',
--- a/src/views/camera/manage/config.data.ts
View file @0bdf4fa
+++ b/src/views/camera/manage/config.data.ts
View file @0bdf4fa
@@ -446,6 +446,7 @@ export const formSchema: QFormSchema[] = [
     ifShow({ values }) {
       return values.accessMode === AccessMode.Streaming;
     },
+    required: true,
     slot: 'videoPlatformIdSlot',
     componentProps: {},
   },
--- a/src/views/device/profiles/step/PhysicalModelManagementStep.vue
View file @0bdf4fa
+++ b/src/views/device/profiles/step/PhysicalModelManagementStep.vue
View file @0bdf4fa
@@ -130,25 +130,25 @@
             {
               label: t('common.sortOperation.isTop'),
               icon: 'ant-design:vertical-align-top-outlined',
-              ifShow: includeSortIsTop.includes(index) ? false : true,
+              ifShow: index === 0 && includeSortIsTop.includes(record.sort) ? false : true,
               onClick: handleTableSort.bind(null, 'topUp', record),
             },
             {
               label: t('common.sortOperation.moveUp'),
               icon: 'ant-design:up-outlined',
-              ifShow: includeSortIsTop.includes(index) ? false : true,
+              ifShow: index === 0 && includeSortIsTop.includes(record.sort) ? false : true,
               onClick: handleTableSort.bind(null, 'up', record),
             },
             {
               label: t('common.sortOperation.moveDown'),
               icon: 'ant-design:down-outlined',
-              ifShow: thingsModelListTotal - index <= 1 ? false : true,
+              ifShow: thingsModelListTotal - record.sort <= 1 ? false : true,
               onClick: handleTableSort.bind(null, 'down', record),
             },
             {
               label: t('common.sortOperation.isBottom'),
               icon: 'ant-design:vertical-align-bottom-outlined',
-              ifShow: thingsModelListTotal - index <= 1 ? false : true,
+              ifShow: thingsModelListTotal - record.sort <= 1 ? false : true,
               onClick: handleTableSort.bind(null, 'bottomUp', record),
             },
           ]"
@@ -215,9 +215,7 @@
     isCategory: Boolean;
   }>();
-  const includeSortIsTop = [0];
-
-  // const includeSortIsBottom = [1];
+  const includeSortIsTop = [0, 1];
   const { createMessage } = useMessage();
   const isShowBtn = ref(false);
@@ -235,7 +233,7 @@
           id: props.record.id,
           selectType: props.record.ifShowClass ? 'category' : undefined,
         });
-        thingsModelListTotal.value = res?.total || 0;
+        thingsModelListTotal.value = (res as Recordable)?.total || 0;
         return res;
       },
       columns: props.record.ifShowClass
--- a/src/views/system/scheduled/index.vue
View file @0bdf4fa
+++ b/src/views/system/scheduled/index.vue
View file @0bdf4fa
@@ -198,7 +198,7 @@
       const newStatus = checked ? 1 : 0;
       const res = await putSchedueByidAndStatusManage(record.id, newStatus);
       if (res && newStatus) {
-        createMessage.success(t('common.enableSuccessOkText'));
+        createMessage.success(t('common.enabledSuccessOkText'));
       } else {
         createMessage.success(t('common.disabledSuccessOkText'));
       }