Merge branch 'f-dev' into 'main'

fix：修改pc端首页右上帮助文档跳转"

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

@@ -3,6 +3,8 @@ import { BasicPageParams } from '/@/api/model/baseModel';
 export type TDeviceConfigPageQueryParam = BasicPageParams & TDeviceConfigParams;
 
 export type TDeviceConfigParams = {
+  page?: any;
+  pageSize?: any;
   name?: string;
   transportType?: string;
   orderFiled?: string;

@@ -15,7 +15,7 @@
 </template>
 <script lang="ts">
   import type { ExportModalResult } from './typing';
-  import { defineComponent } from 'vue';
+  import { defineComponent, nextTick } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
 
@@ -66,7 +66,7 @@
     components: { BasicModal, BasicForm },
     emits: ['success', 'register'],
     setup(_, { emit }) {
-      const [registerForm, { validateFields }] = useForm();
+      const [registerForm, { validateFields, resetFields }] = useForm();
       const [registerModal, { closeModal }] = useModalInner();
 
       async function handleOk() {
@@ -79,12 +79,15 @@
         closeModal();
       }
 
+      const clearFieldFunc = () => nextTick(() => resetFields());
+
       return {
         schemas,
         handleOk,
         registerForm,
         registerModal,
         t,
+        clearFieldFunc,
       };
     },
   });

@@ -10,11 +10,11 @@ export function listToTree(lists: getMenuListResultModel): getMenuListResultMode
 
     // console.log(goods.children?.length);
     if (goods.children?.length) {
-      goods.children.forEach((goodChildren) => {
-        goodChildren['menuName'] = t(goodChildren.meta.title); // 为goodChildren添加属性menuName
-      });
+      listToTree(goods.children);
+      // goods.children.forEach((goodChildren) => {
+      //   goodChildren['menuName'] = t(goodChildren.meta.title); // 为goodChildren添加属性menuName
+      // });
     }
   });
-
   return lists;
 }

@@ -13,10 +13,10 @@
         :clickToRowSelect="false"
       >
         <template #toolbar>
-          <Authority value="api:yt:admin:addAlarmConfig">
+          <Authority value="api:yt:alarm:profile:post">
             <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警配置 </a-button>
           </Authority>
-          <Authority value="api:yt:admin:deleteAlarmConfig">
+          <Authority value="api:yt:alarm:profile:delete">
             <a-button
               type="primary"
               color="error"
@@ -51,7 +51,7 @@
             :actions="[
               {
                 label: '编辑',
-                auth: 'api:yt:admin:editAlarmConfig',
+                auth: 'api:yt:alarm:profile:update',
                 icon: 'clarity:note-edit-line',
                 onClick: handleCreateOrEdit.bind(null, record),
                 ifShow: () => {
@@ -60,7 +60,7 @@
               },
               {
                 label: '删除',
-                auth: 'api:yt:admin:deleteAlarmConfig',
+                auth: 'api:yt:alarm:profile:delete',
                 icon: 'ant-design:delete-outlined',
                 color: 'error',
                 ifShow: () => {

@@ -8,10 +8,10 @@
       />
       <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
         <template #toolbar>
-          <Authority value="api:yt:admin:addAlarmContact">
+          <Authority value="api:yt:alarmContact:post">
             <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警联系人 </a-button>
           </Authority>
-          <Authority value="api:yt:admin:deleteAlarmContact">
+          <Authority value="api:yt:alarmContact:delete">
             <a-button
               type="primary"
               color="error"
@@ -27,13 +27,13 @@
             :actions="[
               {
                 label: '编辑',
-                auth: 'api:yt:admin:editAlarmContact',
+                auth: 'api:yt:alarmContact:update',
                 icon: 'clarity:note-edit-line',
                 onClick: handleCreateOrEdit.bind(null, record),
               },
               {
                 label: '删除',
-                auth: 'api:yt:admin:deleteAlarmContact',
+                auth: 'api:yt:alarmContact:delete',
                 icon: 'ant-design:delete-outlined',
                 color: 'error',
                 popConfirm: {

@@ -6,7 +6,7 @@
           :actions="[
             {
               label: '详情',
-              auth: 'api:yt:admin:viewAlarmLog',
+              auth: 'api:yt:alarm:get',
               icon: 'ant-design:eye-outlined',
               onClick: handleDetail.bind(null, record),
             },

@@ -13,10 +13,10 @@
         class="w-3/4 xl:w-4/5"
       >
         <template #toolbar>
-          <Authority value="api:yt:admin:addCamera">
+          <Authority value="api:yt:video:post">
             <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增视频 </a-button>
           </Authority>
-          <Authority value="api:yt:admin:deleteCamera">
+          <Authority value="api:yt:video:delete">
             <a-button
               type="primary"
               color="error"
@@ -45,18 +45,18 @@
               {
                 label: '预览',
                 icon: 'clarity:note-edit-line',
-                auth: 'api:yt:admin:viewCamera',
+                auth: 'api:yt:video:get',
                 onClick: handleViewVideo.bind(null, record),
               },
               {
                 label: '编辑',
-                auth: 'api:yt:admin:editCamera',
+                auth: 'api:yt:video:update',
                 icon: 'clarity:note-edit-line',
                 onClick: handleCreateOrEdit.bind(null, record),
               },
               {
                 label: '删除',
-                auth: 'api:yt:admin:deleteCamera',
+                auth: 'api:yt:video:delete',
                 icon: 'ant-design:delete-outlined',
                 color: 'error',
                 popConfirm: {

@@ -204,19 +204,23 @@
       const helpDoc = ref([
         {
           title: '如何接入设备?',
-          href: '',
+          href: 'https://docs.thingskit.com/',
+          target: '_blank ',
         },
         {
           title: '什么是设备配置?',
-          href: '',
+          href: 'https://docs.thingskit.com/',
+          target: '_blank ',
         },
         {
           title: '云组态模板如何使用?',
-          href: '',
+          href: 'https://docs.thingskit.com/',
+          target: '_blank ',
         },
         {
           title: '查看全部>>',
-          href: '',
+          href: 'https://docs.thingskit.com/',
+          target: '_blank ',
         },
       ]);
       const activeKey = ref('tab1');

@@ -8,12 +8,12 @@
       />
       <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
-          <Authority value="api:yt:admin:addDeviceList">
+          <Authority value="api:yt:device:post">
             <a-button type="primary" @click="handleCreate" v-if="authBtn(role)">
               新增设备
             </a-button>
           </Authority>
-          <Authority value="api:yt:admin:deleteDeviceList">
+          <Authority value="api:yt:device:delete">
             <a-button
               color="error"
               v-if="authBtn(role)"
@@ -123,19 +123,19 @@
               {
                 label: '详情',
                 icon: 'ant-design:eye-outlined',
-                auth: 'api:yt:admin:viewDeviceList',
+                auth: 'api:yt:device:get',
                 onClick: handleDetail.bind(null, record),
               },
               {
                 label: '编辑',
-                auth: 'api:yt:admin:editDeviceList',
+                auth: 'api:yt:device:update',
                 icon: 'clarity:note-edit-line',
                 ifShow: authBtn(role) && record.customerId === undefined,
                 onClick: handleEdit.bind(null, record),
               },
               {
                 label: '删除',
-                auth: 'api:yt:admin:deleteDeviceList',
+                auth: 'api:yt:device:delete',
                 icon: 'ant-design:delete-outlined',
                 ifShow: authBtn(role) && record.customerId === undefined,
                 color: 'error',

@@ -8,13 +8,15 @@
       :clickToRowSelect="false"
     >
       <template #toolbar>
-        <Authority value="api:yt:admin:addDeviceConfig">
+        <Authority value="api:yt:deviceProfile:post">
           <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button>
         </Authority>
-        <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
-          <a-button disabled @click="handleImport"> 导入设备配置 </a-button>
-        </ImpExcel>
-        <Authority value="api:yt:admin:deleteDeviceConfig">
+        <Authority value="api:yt:deviceProfile:import">
+          <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
+            <a-button @click="handleImport"> 导入设备配置 </a-button>
+          </ImpExcel>
+        </Authority>
+        <Authority value="api:yt:deviceProfile:delete">
           <a-button
             type="primary"
             color="error"
@@ -50,24 +52,25 @@
             },
             {
               label: '详情',
-              auth: 'api:yt:admin:viewDeviceConfig',
+              auth: 'api:yt:deviceProfile:get',
               icon: 'ant-design:eye-outlined',
               onClick: handleDetailView.bind(null, record),
             },
             {
               label: '编辑',
-              auth: 'api:yt:admin:editDeviceConfig',
+              auth: 'api:yt:deviceProfile:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '导出',
+              auth: 'api:yt:deviceProfile:export',
               icon: 'ant-design:login-outlined',
               onClick: handleExport.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteDeviceConfig',
+              auth: 'api:yt:deviceProfile:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
@@ -83,7 +86,11 @@
       </template>
     </BasicTable>
     <DeviceProfileModal @register="registerModal" @success="handleSuccess" />
-    <!-- <ExpExcelModal @register="register1" @success="defaultHeader" /> -->
+    <ExpExcelModal
+      ref="expExcelModalRef"
+      @register="registerExportModal"
+      @success="defaultHeader"
+    />
   </div>
 </template>
 <script lang="ts">
@@ -99,14 +106,24 @@
   import { useModal } from '/@/components/Modal';
   import DeviceProfileModal from '/@/views/device/profiles/DeviceProfileModal.vue';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
-  // import { jsonToSheetXlsx, ExportModalResult } from '/@/components/Excel';
+  import { jsonToSheetXlsx, ExpExcelModal, ExportModalResult } from '/@/components/Excel';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
   export default defineComponent({
     name: 'DeviceProfileManagement',
-    components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, TableImg, Authority },
+    components: {
+      BasicTable,
+      DeviceProfileModal,
+      TableAction,
+      ImpExcel,
+      TableImg,
+      Authority,
+      ExpExcelModal,
+    },
     setup() {
+      const exportData: any = ref([]);
+      const expExcelModalRef = ref(null);
       let selectedRowKeys: any = [];
       const deviceDetailRef = ref(null);
       const getPathUrl = ref('');
@@ -114,10 +131,9 @@
       const disabled = ref(true);
       const onCloseVal = ref(0);
       const immediateStatus = ref(false);
-
       const { createMessage } = useMessage();
       const [registerModal, { openModal }] = useModal();
-      const [registerModalDetail] = useModal();
+      const [registerExportModal, { openModal: openModalExcel }] = useModal();
       const [
         registerTable,
         { setProps, reload, getSelectRows, setTableData, getForm, getSelectRowKeys },
@@ -144,8 +160,11 @@
           fixed: 'right',
         },
       });
-      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
-        useBatchDelete(deviceConfigDelete, handleSuccess, setProps);
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deviceConfigDelete,
+        handleSuccess,
+        setProps
+      );
       selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
         // Demo:status为1的选择框禁用
         if (record.default === true) {
@@ -271,26 +290,6 @@
           disabled.value = true;
         }
       };
-      // const handleTableDel = () => {
-      //   disabled.value = true;
-      //   deviceConfigDelete(selectedRowKeys)
-      //     .then(() => {
-      //       createMessage.success('删除设备配置成功');
-      //       handleSuccess();
-      //       setTimeout(() => {
-      //         disabled.value = false;
-      //       }, 3000);
-      //       selectedRowKeys.length = 0;
-      //     })
-      //     .catch((e) => {
-      //       selectedRowKeys.length = 0;
-      //       setTimeout(() => {
-      //         disabled.value = false;
-      //       }, 3000);
-      //       createMessage.error(e);
-      //     });
-      //   selectedRowKeys.length = 0;
-      // };
 
       function handleDelete(record: Recordable) {
         let ids = [record.id];
@@ -300,24 +299,31 @@
         });
       }
 
-      // function defaultHeader({ filename, bookType }: ExportModalResult) {
-      //   // 默认Object.keys(data[0])作为header
-      //   jsonToSheetXlsx({
-      //     data,
-      //     filename,
-      //     write2excelOpts: {
-      //       bookType,
-      //     },
-      //   });
-      // }
-
-      // const [register1, { openModal: openModalExcel }] = useModal();
+      function defaultHeader({ filename, bookType }: ExportModalResult) {
+        // 默认Object.keys(data[0])作为header
+        const data = exportData.value;
+        jsonToSheetXlsx({
+          data,
+          filename,
+          write2excelOpts: {
+            bookType,
+          },
+        });
+      }
+      //导出
       const handleExport = (record: Recordable) => {
-        console.log(record);
-        // setTimeout(() => {
-        //   openModalExcel();
-        // }, 50);
+        exportData.value = [];
+        exportData.value.push({
+          createTime: record.createTime,
+          description: record.description,
+          name: record.name,
+        });
+        nextTick(() => {
+          openModalExcel();
+          expExcelModalRef.value?.clearFieldFunc();
+        });
       };
+      //导入
       function handleImport() {
         console.log('record');
       }
@@ -354,11 +360,9 @@
         handleSetDefault,
         disabled,
         deviceDetailRef,
-        registerModalDetail,
-        // register1,
-        // defaultHeader,
+        registerExportModal,
+        defaultHeader,
         useSelectionChange,
-        // handleTableDel,
         tableListRef,
         loadDataSuccess,
         handleImport,
@@ -372,6 +376,7 @@
         registerModal,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
+        expExcelModalRef,
       };
     },
   });

@@ -2,10 +2,10 @@
   <div>
     <BasicTable @register="registerTable" :clickToRowSelect="false">
       <template #toolbar>
-        <Authority value="api:yt:admin:addMessageConfig">
+        <Authority value="api:yt:message:post">
           <a-button type="primary" @click="handleCreate"> 新增消息配置 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteMessageConfig">
+        <Authority value="api:yt:message:delete">
           <a-button
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
@@ -32,13 +32,13 @@
           :actions="[
             {
               label: '编辑',
-              auth: 'api:yt:admin:editMessageConfig',
+              auth: 'api:yt:message:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteMessageConfig',
+              auth: 'api:yt:message:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -2,8 +2,10 @@
   <div style="background-color: #f0f2f5">
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="primary" @click="handleExport"> 导出 </a-button>
-        <Authority value="api:yt:admin:deleteMessageLog">
+        <Authority value="api:yt:smsLog:export">
+          <a-button type="primary" @click="handleExport"> 导出 </a-button>
+        </Authority>
+        <Authority value="api:yt:smsLog:delete">
           <a-button
             type="primary"
             color="error"
@@ -19,13 +21,13 @@
           :actions="[
             {
               label: '查看',
-              auth: 'api:yt:admin:viewMessageLog',
+              auth: 'api:yt:smsLog:get',
               icon: 'ant-design:fund-view-outlined',
               onClick: handleQuery.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteMessageLog',
+              auth: 'api:yt:smsLog:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -2,10 +2,10 @@
   <div>
     <BasicTable @register="registerTable" :clickToRowSelect="false">
       <template #toolbar>
-        <Authority value="api:yt:admin:addMessageTemplate">
+        <Authority value="api:yt:template:post">
           <a-button type="primary" @click="handleCreate"> 新增消息模板 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteMessageTemplate">
+        <Authority value="api:yt:template:delete">
           <a-button
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
@@ -34,18 +34,19 @@
           :actions="[
             {
               label: '发送',
+              auth: 'api:yt:template:sendEmail:post',
               icon: 'ant-design:send-outlined',
               onClick: handleModal.bind(null, record),
             },
             {
               label: '编辑',
-              auth: 'api:yt:admin:editMessageTemplate',
+              auth: 'api:yt:template:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteMessageTemplate',
+              auth: 'api:yt:template:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -2,10 +2,10 @@
   <div>
     <BasicTable :clickToRowSelect="false" @register="registerTable">
       <template #toolbar>
-        <Authority value="api:yt:admin:addNotify">
+        <Authority value="api:yt:notice:send:post">
           <a-button type="primary" @click="handleAdd">新增通知</a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteNotify">
+        <Authority value="api:yt:notice:delete">
           <a-button
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
@@ -20,7 +20,7 @@
           :actions="[
             {
               label: '查看',
-              auth: 'api:yt:admin:viewNotify',
+              auth: 'api:yt:notice:get',
               icon: 'ant-design:eye-outlined',
               onClick: handleView.bind(null, record),
               ifShow: (_action) => {
@@ -30,7 +30,7 @@
             },
             {
               label: '编辑',
-              auth: 'api:yt:admin:editNotify',
+              auth: 'api:yt:notice:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               ifShow: (_action) => {
@@ -40,7 +40,7 @@
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteNotify',
+              auth: 'api:yt:notice:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               ifShow: record.creator === userId,

@@ -6,7 +6,7 @@
           :actions="[
             {
               label: '查看',
-              auth: 'api:yt:admin:viewMyNotify',
+              auth: 'api:yt:noticeUser:get',
               tooltip: '查看',
               icon: 'ant-design:eye-outlined',
               onClick: handleView.bind(null, record),

@@ -8,10 +8,10 @@
       :clickToRowSelect="false"
     >
       <template #toolbar>
-        <Authority value="api:yt:admin:addDataFlow">
+        <Authority value="api:yt:convert:config:post">
           <a-button type="primary" @click="handleAdd"> 添加流转 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteDataFlow">
+        <Authority value="api:yt:convert:config:delete">
           <a-button
             type="primary"
             color="error"
@@ -41,7 +41,7 @@
           :actions="[
             {
               label: '编辑',
-              auth: 'api:yt:admin:editDataFlow',
+              auth: 'api:yt:convert:config:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               ifShow: (_action) => {
@@ -51,7 +51,7 @@
 
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteDataFlow',
+              auth: 'api:yt:convert:config:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -2,10 +2,10 @@
   <div>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <Authority value="api:yt:admin:addLinkEdge">
+        <Authority value="api:yt:sceneLinkage:post">
           <a-button type="primary" @click="handleAdd"> 新增场景联动 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteLinkEdge">
+        <Authority value="api:yt:sceneLinkage:delete">
           <a-button
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
@@ -20,20 +20,20 @@
           :actions="[
             {
               label: '查看',
-              auth: 'api:yt:admin:viewLinkEdge',
+              auth: 'api:yt:sceneLinkage:get',
               icon: 'ant-design:eye-outlined',
               onClick: handleView.bind(null, record),
             },
             {
               label: '编辑',
-              auth: 'api:yt:admin:editLinkEdge',
+              auth: 'api:yt:sceneLinkage:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               ifShow: record.creator === userId && record.status !== 1,
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteLinkEdge',
+              auth: 'api:yt:sceneLinkage:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               ifShow: record.creator === userId && record.status !== 1,

@@ -2,10 +2,10 @@
   <div>
     <BasicTable @register="registerTable" v-show="isStatus === 0">
       <template #toolbar>
-        <Authority value="api:yt:admin:addScript">
+        <Authority value="api:yt:convert:js:post">
           <a-button type="primary" @click="handleCreate"> 新增转换脚本 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteScript">
+        <Authority value="api:yt:convert:js:delete">
           <a-button
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
@@ -29,13 +29,13 @@
           :actions="[
             {
               label: '编辑',
-              auth: 'api:yt:admin:editScript',
+              auth: 'api:yt:convert:js:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteScript',
+              auth: 'api:yt:convert:js:delete',
               icon: 'ant-design:delete-outlined',
               ifShow: record.status == 0,
               color: 'error',

@@ -8,10 +8,10 @@
       />
       <BasicTable :clickToRowSelect="false" @register="registerTable" class="w-3/4 xl:w-4/5">
         <template #toolbar>
-          <Authority value="api:yt:admin:addAccount">
+          <Authority value="api:yt:user:post">
             <a-button type="primary" @click="handleCreate">新增账号</a-button>
           </Authority>
-          <Authority value="api:yt:admin:deleteAccount">
+          <Authority value="api:yt:user:delete">
             <a-button
               color="error"
               @click="handleDeleteOrBatchDelete(null)"
@@ -45,7 +45,7 @@
             :actions="[
               {
                 label: '用户详情',
-                auth: 'api:yt:admin:viewAccount',
+                auth: 'api:yt:user:get',
                 icon: 'clarity:info-standard-line',
                 tooltip: '用户详情',
                 onClick: handleView.bind(null, record),
@@ -53,7 +53,7 @@
               },
               {
                 label: '编辑',
-                auth: 'api:yt:admin:editAccount',
+                auth: 'api:yt:user:update',
                 icon: 'clarity:note-edit-line',
                 tooltip: '编辑',
                 onClick: handleEdit.bind(null, record),
@@ -61,7 +61,7 @@
               },
               {
                 label: '删除',
-                auth: 'api:yt:admin:deleteAccount',
+                auth: 'api:yt:user:delete',
                 icon: 'ant-design:delete-outlined',
                 color: 'error',
                 tooltip: '删除',

@@ -81,7 +81,7 @@
       </BasicForm>
     </Card>
     <Loading v-bind="compState" />
-    <Authority value="api:yt:admin:customizeSaveApp">
+    <Authority value="api:yt:appDesign:update:put">
       <a-button @click="handleUpdateInfo" type="primary" class="mt-4">保存信息</a-button>
     </Authority>
   </div>

@@ -83,7 +83,7 @@
       </BasicForm>
     </Card>
     <Loading v-bind="compState" />
-    <Authority value="api:yt:admin:customizeSavePlatform">
+    <Authority value="api:yt:platform:update:put">
       <a-button @click="handleUpdateInfo" type="primary" class="mt-4">保存信息</a-button>
     </Authority>
   </div>

@@ -31,7 +31,7 @@
       </BasicForm>
     </Card>
     <Loading v-bind="compState" />
-    <Authority value="api:yt:admin:customizeUpdate">
+    <Authority value="api:yt:enterprise:update:put">
       <a-button @click="handleUpdateInfo" type="primary" class="mt-4">更新基本信息</a-button>
     </Authority>
   </div>

@@ -2,10 +2,10 @@
   <div>
     <BasicTable :clickToRowSelect="false" @register="registerTable">
       <template #toolbar>
-        <Authority value="api:yt:admin:addDict">
+        <Authority value="api:yt:dict:post">
           <a-button type="primary" @click="handleCreate"> 新增字典 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteDict">
+        <Authority value="api:yt:dict:delete">
           <a-button
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
@@ -25,13 +25,13 @@
             },
             {
               label: '编辑',
-              auth: 'api:yt:admin:editDict',
+              auth: 'api:yt:dict:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteDict',
+              auth: 'api:yt:dict:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -2,7 +2,7 @@
   <div>
     <BasicTable :clickToRowSelect="false" @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
-        <Authority value="api:yt:admin:deleteFeedBack">
+        <Authority value="api:yt:opinion:delete">
           <a-button
             type="primary"
             color="error"
@@ -21,13 +21,13 @@
           :actions="[
             {
               label: '预览',
-              auth: 'api:yt:admin:viewFeedBack',
+              auth: 'api:yt:opinion:get',
               icon: 'clarity:note-edit-line',
               onClick: handleViewVideo.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteFeedBack',
+              auth: 'api:yt:opinion:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -7,7 +7,7 @@
           :actions="[
             {
               label: '详情',
-              auth: 'api:yt:admin:viewFeedBack',
+              auth: 'api:yt:log:get',
               icon: 'clarity:note-edit-line',
               onClick: handleViewDetail.bind(null, record),
             },

@@ -7,7 +7,7 @@
           :actions="[
             {
               label: '详情',
-              auth: 'api:yt:admin:viewFeedBack',
+              auth: 'api:yt:log:get',
               icon: 'clarity:note-edit-line',
               onClick: handleViewDetail.bind(null, record),
             },

@@ -7,7 +7,7 @@
           :actions="[
             {
               label: '详情',
-              auth: 'api:yt:admin:viewFeedBack',
+              auth: 'api:yt:log:get',
               icon: 'clarity:note-edit-line',
               onClick: handleViewDetail.bind(null, record),
             },

@@ -73,7 +73,7 @@
           menuId = Reflect.get(data.record, 'id');
         }
         //加载菜单
-        let treeData = await getMenuList();
+        let treeData = await getMenuList(1);
         treeData = listToTree(treeData);
         updateSchema({
           field: 'parentId',

@@ -2,12 +2,12 @@
   <div class="p-4">
     <BasicTable :clickToRowSelect="false" @register="registerTable" @fetch-success="onFetchSuccess">
       <template #toolbar>
-        <Authority value="api:yt:admin:addOrg">
+        <Authority value="api:yt:organization:post">
           <a-button type="primary" @click="handleCreate">
             {{ getI18n }}
           </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteOrg">
+        <Authority value="api:yt:organization:delete">
           <a-button
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
@@ -22,13 +22,13 @@
           :actions="[
             {
               label: '编辑',
-              auth: 'api:yt:admin:editOrg',
+              auth: 'api:yt:organization:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteOrg',
+              auth: 'api:yt:organization:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -6,10 +6,10 @@
       :clickToRowSelect="false"
     >
       <template #toolbar>
-        <Authority value="api:yt:admin:addSysRole">
+        <Authority value="api:yt:role:saveOrUpdateRoleInfoWithMenu:post">
           <a-button type="primary" @click="handleCreate">新增角色</a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteSysRole">
+        <Authority value="api:yt:role:delete">
           <a-button
             type="primary"
             color="error"
@@ -34,13 +34,13 @@
           :actions="[
             {
               label: '编辑',
-              auth: 'api:yt:admin:editSysRole',
+              auth: 'api:yt:role:saveOrUpdateRoleInfoWithMenu:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteSysRole',
+              auth: 'api:yt:role:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               ifShow: record.roleType != RoleEnum.SYS_ADMIN,

@@ -7,10 +7,10 @@
       :clickToRowSelect="false"
     >
       <template #toolbar>
-        <Authority value="api:yt:admin:addTenantConfig">
+        <Authority value="api:yt:tenantProfile:post">
           <a-button type="primary" @click="handleAdd"> 新增租户配置 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteTenantConfig">
+        <Authority value="api:yt:tenantProfile:delete">
           <a-button color="error" :disabled="disabled" @click="handleMutilteDelete">
             批量删除
           </a-button>
@@ -27,13 +27,13 @@
             },
             {
               label: '编辑',
-              auth: 'api:yt:admin:editTenantConfig',
+              auth: 'api:yt:tenantProfile:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteTenantConfig',
+              auth: 'api:yt:tenantProfile:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -2,7 +2,7 @@
   <div>
     <BasicTable @register="tenantTable">
       <template #toolbar>
-        <Authority value="api:yt:admin:saveTenant">
+        <Authority value="api:yt:admin:tenant:post">
           <a-button type="primary" @click="handleCreate"> 新增租户</a-button>
         </Authority>
       </template>
@@ -48,13 +48,13 @@
             {
               icon: 'clarity:note-edit-line',
               label: '编辑',
-              auth: 'api:yt:admin:editTenant',
+              auth: 'api:yt:admin:tenant:update',
               onClick: handleEdit.bind(null, record),
             },
             {
               icon: 'ant-design:delete-outlined',
               label: '删除',
-              auth: 'api:yt:admin:deleteTenant',
+              auth: 'api:yt:admin:tenant:delete',
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',

@@ -6,10 +6,10 @@
       :clickToRowSelect="false"
     >
       <template #toolbar>
-        <Authority value="api:yt:admin:addTenantRole">
+        <Authority value="api:yt:role:saveOrUpdateRoleInfoWithMenu:post">
           <a-button type="primary" @click="handleCreate"> 新增角色 </a-button>
         </Authority>
-        <Authority value="api:yt:admin:deleteTenantRole">
+        <Authority value="api:yt:role:delete">
           <a-button
             type="primary"
             color="error"
@@ -34,13 +34,13 @@
           :actions="[
             {
               label: '编辑',
-              auth: 'api:yt:admin:editTenantRole',
+              auth: 'api:yt:role:saveOrUpdateRoleInfoWithMenu:update',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:admin:deleteTenantRole',
+              auth: 'api:yt:role:delete',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {