Merge branch 'ft_local_dev' into 'main'

pref:优化Topic内容

See merge request huang/yun-teng-iot-front!414

@@ -96,10 +96,6 @@ export function getTenantPage(params: TenantPageRequestParams) {
   return getPageData<TenantDTO>(params, Api.tenantPage);
 }
 
-// export function getTenantAdminPage(params: TenantAdminPageRequestParams) {
-//   return getPageData<UserDTO>(params, Api.userPage);
-// }
-
 //分页
 export const getTenantAdminPage = (params: TenantAdminPageRequestParams) => {
   return defHttp.get<TenantAdminPageRequestParams>({

@@ -40,9 +40,8 @@ export interface TenantPageRequestParams extends BaseQueryParams {
 
 export interface TenantAdminPageRequestParams extends BaseQueryParams {
   realName?: string;
-  // tenantCode: string;
   tenantId?: string;
-  // roleType?: string;
+  items?: string[];
 }
 
 export interface tenantProfileDTO {

@@ -25,7 +25,7 @@
         >
         <div class="change-avatar" style="text-align: center">
           <div class="mb-2" style="font-weight: 700">个人头像</div>
-          <div style="display: flex; align-items: center; justify-content: center; width: 35.6rem">
+          <div style="display: flex; align-items: center; justify-content: center">
             <div>
               <Upload
                 name="avatar"
@@ -265,7 +265,8 @@
       transition: border-color 0.3s ease;
     }
   }
+
   .headSetPop :global(.ant-modal-header) {
-    padding: 27px 0px !important;
+    padding: 27px 0 !important;
   }
 </style>

@@ -18,10 +18,7 @@
             <ListItem @click="go('/notice/myNotices')" class="cursor-pointer">
               <ListItemMeta>
                 <template #avatar>
-                  <Avatar
-                    :src="item.sysNotice.avatar ?? defaultAvatar(item.receiverId)"
-                    size="large"
-                  />
+                  <Avatar :src="item.sysNotice.avatar" size="large" />
                 </template>
                 <template #description>
                   <span class="cursor-pointer noticeTitle">{{ item.sysNotice.title }} </span>
@@ -92,7 +89,7 @@
                       ? '#e6e6e5'
                       : index === 2
                       ? '#f8c296'
-                      : '#0b55f1;',
+                      : '#0b55f1',
                 }"
                 >{{ index + 1 }}</span
               >
@@ -169,7 +166,6 @@
   import { BasicTable, useTable } from '/@/components/Table';
   import { isAdmin } from '/@/enums/roleEnum';
   import { getTenantExpireTimeList, getTenantTop10 } from '/@/api/dashboard';
-  import headerImg from '/@/assets/images/logo.png';
 
   export default defineComponent({
     components: {
@@ -257,11 +253,6 @@
       });
 
       const userStore = useUserStore();
-      const defaultAvatar = (uid) => {
-        if (uid === userStore.getUserInfo?.userId) {
-          return userStore.getUserInfo?.avatar || headerImg;
-        }
-      };
       const getContacts = computed(() => {
         return userStore.enterPriseInfo?.contacts;
       });
@@ -302,7 +293,6 @@
         registerTable,
         isAdmin,
         Empty,
-        defaultAvatar,
       };
     },
   });

@@ -199,6 +199,7 @@ export const step2Schemas: FormSchema[] = [
   {
     field: 'transportType',
     component: 'Select',
+    required: true,
     label: '接入协议',
     defaultValue: 'DEFAULT',
     componentProps() {
@@ -454,13 +455,31 @@ export const topicTableColumn: BasicColumn[] = [
     width: 100,
   },
   {
-    title: 'Topic类',
-    dataIndex: 'class',
+    title: '发布主题',
+    dataIndex: 'release',
     width: 100,
   },
+
   {
-    title: '描述',
-    dataIndex: 'description',
+    title: '订阅主题',
+    dataIndex: 'subscribe',
     width: 100,
   },
+  {
+    title: '平台',
+    dataIndex: 'platform',
+    width: 30,
+  },
+
+  {
+    title: '设备',
+    dataIndex: 'device',
+    width: 30,
+  },
+
+  // {
+  //   title: '描述',
+  //   dataIndex: 'description',
+  //   width: 100,
+  // },
 ];

 <script lang="ts" setup>
   import { topicTableColumn } from '../device.profile.data';
   import { BasicTable, useTable } from '/@/components/Table';
-  import { buildUUID } from '/@/utils/uuid';
 
   const list = [
-    { function: '遥测主题', class: 'v1/devices/me/telemetry' },
-    { function: '属性主题', class: 'v1/devices/me/attributes' },
-    { function: '设备上报事件主题', class: 'v1/devices/me/attributes' },
-    { function: '服务控制设备(RPC)主题', class: 'v1/devices/me/attributes' },
+    {
+      function: '网关/直连设备遥测',
+      release: 'v1/devices/me/telemetry',
+      subscribe: 'v1/devices/me/telemetry',
+      platform: '订阅',
+      device: '发布',
+    },
+    {
+      function: '服务端命令下发到设备端',
+      release: 'v1/devices/me/rpc/request/$request_id',
+      subscribe: 'v1/devices/me/rpc/request/+',
+      platform: '发布',
+      device: '订阅',
+    },
+    {
+      function: '设备端响应命令到服务端',
+      release: 'v1/devices/me/rpc/response/$request_id',
+      subscribe: 'v1/devices/me/rpc/response/+',
+      platform: '订阅',
+      device: '发布',
+    },
+    {
+      function: '直连设备属性上报',
+      release: 'v1/devices/me/attributes',
+      subscribe: 'v1/devices/me/attributes',
+      platform: '订阅',
+      device: '发布',
+    },
+
+    {
+      function: '设备端请求服务端共享属性及客户端属性',
+      release: 'vv1/devices/me/attributes/response/$request_id',
+      subscribe: 'v1/devices/me/attributes/response/+',
+      platform: '订阅',
+      device: '发布',
+    },
+    {
+      function: '服务端响应共享属性集客户端属性给设备端',
+      release: 'v1/devices/me/attributes/response/$request_id',
+      subscribe: 'v1/devices/me/attributes/response/+',
+      platform: '发布',
+      device: '订阅',
+    },
+    {
+      function: '设备端请求服务端子设备共享属性及客户端属性',
+      release: 'v1/gateway/attributes/request',
+      subscribe: 'v1/gateway/attributes/request',
+      platform: '订阅',
+      device: '发布',
+    },
+    {
+      function: '服务端响应子设备共享属性及客户端属性给设备端',
+      release: 'v1/gateway/attributes/response',
+      subscribe: 'v1/gateway/attributes/response',
+      platform: '发布',
+      device: '订阅',
+    },
+    {
+      function: '设备端上报子设备客户端属性',
+      release: 'v1/gateway/attributes',
+      subscribe: 'v1/gateway/attributes',
+      platform: '订阅',
+      device: '发布',
+    },
+    {
+      function: '网关子设备遥测',
+      release: 'v1/gateway/telemetry',
+      subscribe: 'v1/gateway/telemetry',
+      platform: '订阅',
+      device: '发布',
+    },
   ];
 
-  const dataSource = Array.from({ length: 10 }, (_, index) => {
-    const record = list[index % 4];
-    return {
-      id: buildUUID(),
-      ...record,
-      description: record.function,
-    };
-  });
+  const dataSource = list;
 
   const [register] = useTable({
     title: 'Topic',

@@ -37,11 +37,9 @@
   import { SelectTypes } from 'ant-design-vue/es/select';
   import { Select } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
-  import { useMessage } from '/@/hooks/web/useMessage';
   import { getScriptManageMeList } from '/@/api/scriptmanage/scriptManager';
   import ConverScriptModal from '/@/views/scriptmanage/converscript/ConverScriptModal.vue';
 
-  const { createMessage } = useMessage();
   const selectScript = reactive<Record<'script', Nullable<string>>>({
     script: null,
   });
@@ -91,6 +89,7 @@
       openModal(true, {
         isUpdate: false,
         isTest: true,
+        record: selectScript.script,
         isText: 'test',
         isTitle: 'test',
       });
@@ -98,10 +97,6 @@
   };
 
   const getFormData = () => {
-    if (!selectScript.script) {
-      createMessage.error('请选择转换脚本');
-      throw '请选择转换脚本';
-    }
     const value = {
       ...{
         scriptId: selectScript.script,

@@ -29,10 +29,12 @@
   } from '/@/api/stationnotification/stationnotifyApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
+  import { useUserStore } from '/@/store/modules/user';
+  import headerImg from '/@/assets/images/logo.png';
 
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicForm,Authority },
+    components: { BasicDrawer, BasicForm, Authority },
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const draftDisable = ref(false);
@@ -62,6 +64,9 @@
           setFieldsValue(data.record);
         }
       });
+      const userStore = useUserStore();
+      const avatar = ref<string | undefined>('');
+      avatar.value = userStore.getUserInfo?.avatar || headerImg;
       // 发布通知
       const handleSend = async () => {
         try {
@@ -75,6 +80,7 @@
             ...field,
             pointId,
             id: unref(isUpdate) ? unref(noticeId) : undefined,
+            avatar: avatar.value,
           };
           await notifyAddLeaseApi(editNotice);
           emit('success');
@@ -106,6 +112,7 @@
               ...field,
               pointId,
               id: unref(noticeId),
+              avatar: avatar.value,
             };
             await notifyAddDraftApi(editDraft);
           }

@@ -14,7 +14,12 @@
         :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]"
       >
         <a-input v-if="ifAdd" v-model:value="scriptForm.name" placeholder="请输入脚本名称" />
-        <a-input v-else v-model:value="scriptForm.params" placeholder="请输入参数" />
+        <a-input
+          @change="handleInputChange"
+          v-else
+          v-model:value="scriptForm.params"
+          placeholder="请输入参数"
+        />
       </a-form-item>
       <a-form-item
         label="上报数据类型"
@@ -25,6 +30,15 @@
           <a-radio-group v-model:value="scriptForm.dataType" :options="typeOptions" />
         </a-space>
       </a-form-item>
+      <a-form-item
+        label="保存原始数据"
+        name="saveOriginalData"
+        :rules="[{ required: true, message: '请选择保存原始数据' }]"
+      >
+        <a-space direction="vertical">
+          <a-radio-group v-model:value="scriptForm.saveOriginalData" :options="originalOptions" />
+        </a-space>
+      </a-form-item>
       <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
         <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
           <template #extra>
@@ -74,7 +88,8 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
-  import { defaultTitle, defaultScriptContent } from './config.data';
+  import { defaultTitle } from './config.data';
+  import { nextTick } from 'process';
 
   defineEmits(['register']);
   const props = defineProps({
@@ -88,11 +103,13 @@
     params: '',
     output: '',
     dataType: 'HEX',
+    saveOriginalData: 'false',
   });
   const reportTypeOptions = reactive({
     typeOptions: [],
+    originalOptions: [],
   });
-  const { typeOptions } = toRefs(reportTypeOptions);
+  const { typeOptions, originalOptions } = toRefs(reportTypeOptions);
   const { createMessage } = useMessage();
   const { clipboardRef, copiedRef } = useCopyToClipboard();
   const aceEditor = ref();
@@ -101,10 +118,17 @@
     const res: any = await findDictItemByCode({
       dictCode: 'report_data_type',
     });
+    const resOriginal: any = await findDictItemByCode({
+      dictCode: 'original_data',
+    });
     reportTypeOptions.typeOptions = res.map((m) => {
       return { label: m.itemText, value: m.itemValue };
     });
+    reportTypeOptions.originalOptions = resOriginal.map((m) => {
+      return { label: m.itemText, value: m.itemValue };
+    });
     scriptForm.dataType = 'HEX';
+    scriptForm.saveOriginalData = 'false';
   });
   // 初始化编辑器
   const initEditor = (jsScript?: string) => {
@@ -121,7 +145,7 @@
       enableBasicAutocompletion: true,
       enableLiveAutocompletion: true,
     });
-    aceEditor.value.setValue(jsScript ?? defaultScriptContent);
+    aceEditor.value.setValue(jsScript);
     beautify(aceEditor.value.session);
     scriptForm.convertJs = aceEditor.value.getValue();
   };
@@ -154,18 +178,35 @@
       }
     }
     if (!value) return;
+    if (scriptForm.params) {
+      const trimParams = scriptForm.params.replace(/\s*/g, '');
+      Reflect.set(value, 'params', trimParams);
+    }
     return {
       ...value,
       ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null },
       ...{ script: !props.ifAdd ? scriptForm.script : null },
+      ...{ saveOriginalData: scriptForm.saveOriginalData === 'false' ? false : true },
     };
   };
+  const handleInputChange = (e) => {
+    const trimParams = e.target.value.replace(/\s*/g, '');
+    Reflect.set(scriptForm, 'params', trimParams);
+  };
   const setFormData = (v) => {
-    for (let i in scriptForm) {
-      Reflect.set(scriptForm, i, v[i]);
+    if (v) {
+      for (let i in scriptForm) {
+        Reflect.set(scriptForm, i, v[i]);
+      }
+      nextTick(() => {
+        setTimeout(() => {
+          scriptForm.saveOriginalData = v.saveOriginalData === false ? 'false' : 'true';
+          scriptForm.dataType = v.dataType;
+        }, 500);
+      });
+      aceEditor.value.setValue(v.convertJs);
+      handleFormat();
     }
-    aceEditor.value.setValue(v.convertJs);
-    handleFormat();
   };
   const setScriptContentData = (v) => {
     aceEditor.value.setValue(v);

@@ -60,8 +60,10 @@
         converScriptRef.value?.setFormData(data.record);
       }
       if (unref(isTitle) == 'test') {
-        // converScriptRef.value?.setScriptContentData('');
-        converScriptRef.value?.setFormData(data.record);
+        if (data.record) {
+          const res = await getScriptManageDetail(data.record);
+          converScriptRef.value?.setFormData(res);
+        }
       }
       setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });
       if (!unref(isUpdate)) {
@@ -96,15 +98,15 @@
         setTimeout(() => {
           closeModal();
         }, 10);
+        emits('success', {
+          res,
+          text: isText.value,
+        });
       } else {
         if (res) {
           converScriptRef.value?.setScriptOutputData(res?.output || res?.error);
         }
       }
-      emits('success', {
-        res,
-        text: isText.value,
-      });
     } finally {
       setModalProps({ confirmLoading: false });
     }

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
+import { h } from 'vue';
 
 // 表格配置
 export const columns: BasicColumn[] = [
@@ -57,7 +58,20 @@ export const searchFormSchema: FormSchema[] = [
   },
 ];
 
-export const defaultScriptContent = `
-   out.msg= "hello"+params;
-  `;
-export const defaultTitle = '格式：' + defaultScriptContent;
+export const defaultTitle = h('div', { style: 'background:#404040' }, [
+  h('h3', { style: 'color:white' }, '示例:'),
+  h('h3', { style: 'color:white' }, '输入参数:0103040150008D3BBB'),
+  h('h3', { style: 'color:white' }, [
+    h(
+      'h3',
+      { style: 'color:white' },
+      "脚本内容:out.humidity = (parseInt('0x'+params.substr(6, 4))*0.1).toFixed(2);"
+    ),
+    h(
+      'h3',
+      { style: 'color:white' },
+      "out.temperature = (parseInt('0x'+params.substr(10, 4))*0.1).toFixed(2);"
+    ),
+    h('h3', { style: 'color:white' }, "输出参数:{'humidity':'33.60','temperature':'14.10'}"),
+  ]),
+]);

@@ -115,6 +115,14 @@
 
   const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
     useBatchDelete(deleteScriptManage, handleSuccess, setProps);
+  selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+    // Demo:status为1的选择框禁用
+    if (record.status === 1) {
+      return { disabled: true };
+    } else {
+      return { disabled: false };
+    }
+  };
 
   nextTick(() => {
     setProps(selectionOptions);
@@ -147,7 +155,7 @@
     if (record) {
       openModal(true, {
         isUpdate: false,
-        record,
+        record: record.id,
         isTest: true,
         isText: 'test',
         isTitle: 'test',

@@ -12,10 +12,10 @@
     >
       <div>
         <a-row type="flex">
-          <a-col :span="2" style="margin-left: 5rem">
+          <a-col :span="3" style="">
             <a-input v-model:value="searchInfo.jobName" placeholder="请输入任务名称" />
           </a-col>
-          <a-col :span="4" style="margin-left: 5rem">
+          <a-col :span="4" style="margin-left: 2rem">
             <a-select
               allowClear
               v-model:value="searchInfo.jobGroup"
@@ -23,8 +23,7 @@
               placeholder="请选择任务组名"
               style="width: 200px"
               :options="optionGroup"
-            >
-            </a-select>
+            />
           </a-col>
           <a-col :span="4">
             <a-select
@@ -33,8 +32,7 @@
               placeholder="请选择执行状态"
               style="width: 200px"
               :options="optionStatus"
-            >
-            </a-select>
+            />
           </a-col>
           <a-col :span="4">
             <a-range-picker

@@ -93,7 +93,6 @@
   import TenantAdminFormDrawer from './TenantAdminFormDrawer.vue';
   import { MessageTypeEnum, SendResetPasswordEmailMsg } from '/@/api/tenant/tenantInfo';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { RoleEnum } from '/@/enums/roleEnum';
   import { Authority } from '/@/components/Authority';
 
   export default defineComponent({
@@ -113,17 +112,15 @@
 
       const tenantId = ref('');
       async function handleCreateTenantAdmin() {
-        const { items: getPageData } = await getTenantAdminPage({
+        const { items } = await getTenantAdminPage({
           page: 1,
           pageSize: 1000,
           tenantId: tenantId.value,
-          roleType: RoleEnum.TENANT_ADMIN,
-          tenantCode: '',
         });
         openTenantAdminFormDrawer(true, {
           isUpdate: false,
           tenantId: tenantId.value,
-          judgeExistUserName: getPageData,
+          judgeExistUserName: items,
         });
       }
 
@@ -192,7 +189,6 @@
         showIndexColumn: false,
         searchInfo: {
           tenantId,
-          // roleType: RoleEnum.TENANT_ADMIN,
         },
         actionColumn: {
           width: 100,