浏览代码

资源中心

sujunling 2 年之前
父节点
当前提交
1de03b8514

+ 4 - 4
src/api/message/records.ts

@@ -15,10 +15,10 @@ enum MessageRecordsApi {
  * @param params 查询参数
  */
 export const smsLogPage = (params: MessageRecordsParams) => {
-  return defHttp.get<SmsLogModelResult>({
-    url: MessageRecordsApi.SMS_RECORDS,
-    params,
-  });
+  // return defHttp.get<SmsLogModelResult>({
+  //   url: MessageRecordsApi.SMS_RECORDS,
+  //   params,
+  // });
 };
 
 /**

+ 0 - 1
src/api/resource/map.ts

@@ -27,7 +27,6 @@ export function list() {
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
             .then((r) => {
-                debugger
                 resolve(JSON.parse(r.result));
             })
     })

+ 52 - 0
src/api/resource/plat.ts

@@ -0,0 +1,52 @@
+import { defHttp } from '/@/utils/http/axios';
+import { session } from "/@/utils/Memory.js";
+import type { ErrorMessageMode } from '/#/axios';
+import md5 from 'js-md5';
+
+
+enum Api {
+    CallProvider = '/callProvider'
+}
+
+const client = {
+    grant_type: "password",
+    scope: "all",
+    client_id: "space",
+    client_secret: 'e10adc3949ba59abbe56e057f20f883e',
+}
+
+const interfaceType = { apiUrl2: true };
+
+/**
+ * @description:获取地图资源列表
+ */
+export function list() {
+    const formData = new FormData();
+    formData.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
+    formData.append("methodName", "getResourcePagedList");
+    formData.append("args[]", session.getItem('token'));
+    formData.append("args[]", '{ "type": "MR", "fields": { "DATA": ["serviceid", "servicename", "servicetype", "servicealiasname"], "METADATA": ["publisher ", "publishdate"] }, "pageIndex": 1, "pageSize": 4 }');
+    return new Promise<void>((resolve, reject) => {
+        defHttp.post({ url: Api.CallProvider, params: formData, ...interfaceType })
+            .then((r) => {
+                // resolve(JSON.parse(r.result));
+                resolve({});
+            })
+    })
+}
+
+/**
+ * @description:获取地图资源目录树结构
+ */
+export function platList() {
+    const f = new URLSearchParams();
+    f.append("interfaceName", "antu.space.provider.tags.TagsProvider");
+    f.append("methodName", "getAll");
+    f.append("args[]", session.getItem('tokenV2'));
+    return new Promise<void>((resolve, reject) => {
+        defHttp.post({ url: Api.CallProvider, params: f, ...interfaceType })
+            .then((r) => {
+                resolve(JSON.parse(r.result));
+            })
+    })
+}

+ 22 - 1
src/api/sys/menu.ts

@@ -13,7 +13,8 @@ enum Api {
   GetMenuList = '/menu/me/menus',
   SysAdminMenuList = '/admin/me/menus',
   GetMenuIdsByRoleId = '/menu/get_ids/',
-  GetChildDepartment = '/user-center/department/getChildDepartment'
+  GetChildDepartment = '/user-center/department/getChildDepartment',
+  GetMenuTreeData = "/base-center/menu/getMenuTreeData"
 }
 
 
@@ -72,6 +73,26 @@ export const getMenuList = (args?: number) => {
   } catch (e) { }
 };
 
+/**
+ * @description: 获取新菜单列表
+ */
+
+export const menuList = (args?: number) => {
+  try {
+
+    return new Promise<void>((resolve, reject) => {
+      return defHttp.post<getMenuListResultModel>({
+        url: Api.GetMenuTreeData,
+      }).then(r => {
+        console.log("22222:", r.datas);
+        resolve(r.datas)
+      });
+    })
+  } catch (e) {
+
+  };
+}
+
 /**
  * @description: Get user menu based on id
  */

+ 21 - 0
src/api/sys/user.ts

@@ -56,9 +56,29 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
         r.token = r.access_token;
         session.setItem('token', r.access_token);
         resolve(r);
+        // loginCallProvider();
       })
   })
 }
+
+
+export function loginCallProvider() {
+  var a = {
+    interfaceName: "atp-provider.controller.AtpController",
+    methodName: "getToken",
+    args: ['superAtp', '#super&Atp@123']
+  }
+  const f = new FormData();
+  Object.keys(a).forEach((key) => f.append(key, a[key]))
+  return new Promise<void>((resolve, reject) => {
+    defHttp.post<LoginResultModel>({ url: Api.GetPermCode, params: f, ...interfaceType, })
+      .then((r) => {
+        debugger;
+      })
+  })
+}
+
+
 export function getMyInfo() {
   var a = session.getItem('loginFrom');
   const formData = new URLSearchParams();
@@ -76,6 +96,7 @@ export function getMyInfo() {
     }, { joinPrefix: false }).then((i) => {
       console.log(i)
       var u = JSON.parse(i.result);
+      session.setItem('tokenV2', u.tokenV2);
       var a = {
         info: u,
         "userId": "80808080-8080-8080-8080-808080808080",

+ 23 - 1
src/mock/menu.json

@@ -325,7 +325,7 @@
                 "type": "SYSADMIN",
                 "permission": "scene:resource:centre",
                 "sort": 20,
-                "component": "LAYOUT",
+                "component": "/resource/plat/index",
                 "meta": {
                     "icon": "mdi:airballoon",
                     "title": "场景资源",
@@ -1159,6 +1159,28 @@
                     "hideMenu": false,
                     "status": "0"
                 }
+            },
+            {
+                "id": "60d370b3-edf7-4e1d-bfef-4538cc04f1b2",
+                "createTime": "2023-08-01 12:01:32",
+                "name": "菜单管理",
+                "parentId": "27ec1926-8369-4cca-bf8e-dbd25d70c6bb",
+                "children": [],
+                "path": "/systemAdmin/system/menu",
+                "type": "SYSADMIN",
+                "permission": "systemAdmin:system:menu",
+                "sort": 11,
+                "component": "/systemAdmin/system/menu/index",
+                "meta": {
+                    "icon": "mdi:account-group",
+                    "title": "菜单管理",
+                    "isLink": false,
+                    "menuType": "0",
+                    "hideMenu": false,
+                    "status": "0"
+                },
+                "menuSys": "2",
+                "menuOut": "1"
             }
         ],
         "path": "/systemAdmin/system",

+ 1 - 0
src/mock/menu_get_ids.json

@@ -9,6 +9,7 @@
     "83326dff-9f55-4930-abea-09e61306c2d5",
     "502c9897-4abe-44ad-92cf-a74d402f7fe3",
     "4ce99298-d100-4479-ac61-3f6762ade2c4",
+    "60d370b3-edf7-4e1d-bfef-4538cc04f1b2",
     "50843259-c2de-442a-9da2-9a17f161a970",
     "d748df94-bf81-4a9a-8918-56a07e6ce61e",
     "4196ae37-9026-4761-bd99-495ffff085b8",

+ 1 - 0
src/mock/role_me_permissions.json

@@ -5,6 +5,7 @@
     "api:yt:platform:update:update",
     "api:yt:dictItem:delete",
     "resource:centre",
+    "systemAdmin:system:menu",
     "api:dataresource:mapupload:maploadDelete",
     "api:basinHydropower:projectInfo:projectInfoAudit",
     "alertTemplateManagement:manage:view",

+ 17 - 0
src/views/resource/plat/data.ts

@@ -0,0 +1,17 @@
+export interface TabItem {
+  key: string;
+  name: string;
+  component: string;
+}
+export const achieveList: TabItem[] = [
+  {
+    key: '1',
+    name: '地图资源(1)',
+    component: 'SmsLog',
+  },
+  {
+    key: '2',
+    name: '成果数据(2)',
+    component: 'EmailLog',
+  },
+];

+ 94 - 0
src/views/resource/plat/index.vue

@@ -0,0 +1,94 @@
+<template>
+  <div :class="[`${prefixCls}-bottom`, '!dark:bg-dark-900']">
+    <div class="datacenter-left">
+      <div class="page-name">
+        <p>数据目录</p>
+      </div>
+      <div class="ztree-container">111</div>
+    </div>
+    <Tabs>
+      <template v-for="item in achieveList" :key="item.key">
+        <TabPane :tab="item.name">
+          <component :is="item.component" />
+        </TabPane>
+      </template>
+    </Tabs>
+  </div>
+</template>
+
+<script lang="ts">
+import { Tabs } from 'ant-design-vue';
+import { defineComponent } from 'vue';
+import SmsLog from './item/SmsLog.vue';
+import EmailLog from './item/EmailLog.vue';
+import { achieveList } from './data';
+import { onMounted } from 'vue';
+import { platList } from '/@/api/resource/plat';
+
+const prefixCls = 'account-center-bottom'
+
+export default defineComponent({
+  components: {
+    Tabs,
+    TabPane: Tabs.TabPane,
+    SmsLog,
+    EmailLog,
+  },
+  setup() {
+
+    onMounted(() => {
+      platList();
+    });
+
+    return {
+      prefixCls: 'account-center',
+      achieveList,
+    };
+  },
+});
+</script>
+<style lang="less" scoped>
+.ztree-container {
+  float: left;
+  overflow: auto;
+  width: 100%;
+  height: auto;
+  max-height: 976px;
+}
+
+.datacenter-left .page-name {
+  background: #333333;
+}
+
+.datacenter-left .page-name p {
+  height: 42px;
+  line-height: 42px;
+  padding-left: 16px;
+  font-size: 16px;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #ffffff;
+}
+
+.datacenter-left {
+  float: left;
+  width: 250px;
+  height: auto;
+  margin-right: 16px;
+  border: 1px solid #dfdfdf;
+  border-top: none;
+  background: #f5f5f5;
+  overflow: auto;
+  height: calc(100% - 20px);
+  max-height: 1306px;
+}
+
+.account-center {
+  &-bottom {
+    padding: 10px;
+    margin: 16px;
+    // background-color: @component-background;
+    border-radius: 3px;
+  }
+}
+</style>

+ 63 - 0
src/views/resource/plat/item/EmailDetail.vue

@@ -0,0 +1,63 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="邮件发送参数"
+    centered
+    :okButtonProps="{ disabled: true }"
+    @ok="handleOK"
+    :width="700"
+  >
+    <div class="pt-6px pr-6px">
+      <BasicForm @register="registerForm" />
+    </div>
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, h } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { Tinymce } from '/@/components/Tinymce';
+  const schemas: FormSchema[] = [
+    {
+      field: 'emailBody',
+      component: 'Input',
+      label: '',
+      rules: [{ required: true }],
+      render: ({ model, field }) => {
+        return h(Tinymce, {
+          value: model[field],
+          // showImageUpload: false,
+          onChange: (value: string) => {
+            model[field] = value;
+          },
+        });
+      },
+    },
+  ];
+  export default defineComponent({
+    components: { BasicModal, BasicForm },
+    setup() {
+      const [registerForm, { resetFields, setFieldsValue }] = useForm({
+        labelWidth: 70,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const [register, { closeModal }] = useModalInner(async (data) => {
+        await resetFields();
+        await setFieldsValue({
+          ...data.record,
+        });
+      });
+
+      async function handleOK() {
+        closeModal();
+      }
+
+      return { register, schemas, registerForm, handleOK };
+    },
+  });
+</script>

+ 119 - 0
src/views/resource/plat/item/EmailLog.vue

@@ -0,0 +1,119 @@
+<template>
+  <div style="background-color: #f0f2f5" class="dark:bg-dark-900">
+    <BasicTable @register="registerTable" class="dark:bg-dark-900">
+      <template #toolbar>
+        <!-- <Authority value="api:yt:smsLog:export">
+          <a-button type="primary" @click="handleCreate"> 导出 </a-button>
+        </Authority> -->
+        <Authority value="api:yt:smsLog:delete">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDeleteOrBatchDelete(null)"
+          >
+            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+          </Popconfirm>
+        </Authority>
+      </template>
+      <template #remark="{ record }">
+        <Tooltip :title="record.remark">
+          <div class="truncate w-full">{{ record.remark }}</div>
+        </Tooltip>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: '查看',
+              auth: 'api:yt:smsLog:get',
+              icon: 'ant-design:fund-view-outlined',
+              onClick: handleModal.bind(null, record),
+            },
+            {
+              label: '删除',
+              auth: 'api:yt:smsLog:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
+    </BasicTable>
+    <EmailDetail @register="registerModal" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, nextTick } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { columns, searchFormSchema } from './email.data';
+  import { mailLogPage, deleteMailLog } from '/@/api/message/records';
+  import { useModal } from '/@/components/Modal';
+  import EmailDetail from './EmailDetail.vue';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { Authority } from '/@/components/Authority';
+  import { Popconfirm, Tooltip } from 'ant-design-vue';
+
+  export default defineComponent({
+    name: 'EmailLog',
+    components: { EmailDetail, BasicTable, TableAction, Authority, Popconfirm, Tooltip },
+    setup() {
+      const [registerModal, { openModal }] = useModal();
+      const [registerTable, { reload, setProps }] = useTable({
+        title: '邮件发送列表',
+        api: mailLogPage,
+        columns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+          fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        actionColumn: {
+          width: 200,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: 'right',
+        },
+      });
+      const { hasBatchDelete, selectionOptions, handleDeleteOrBatchDelete } = useBatchDelete(
+        deleteMailLog,
+        handleSuccess,
+        setProps
+      );
+      nextTick(() => {
+        setProps(selectionOptions);
+      });
+
+      function handleCreate() {}
+
+      function handleModal(record: Recordable) {
+        openModal(true, {
+          record,
+        });
+      }
+
+      function handleSuccess() {
+        reload();
+      }
+
+      return {
+        registerTable,
+        registerModal,
+        handleCreate,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
+        handleModal,
+        handleSuccess,
+      };
+    },
+  });
+</script>

+ 117 - 0
src/views/resource/plat/item/SmsLog.vue

@@ -0,0 +1,117 @@
+<template>
+  <div style="background-color: #f0f2f5" class="dark:bg-dark-900">
+    <BasicTable @register="registerTable" class="dark:bg-dark-900">
+      <template #toolbar>
+        <!-- <Authority value="api:yt:smsLog:export">
+          <a-button type="primary" @click="handleExport"> 导出 </a-button>
+        </Authority> -->
+        <Authority value="api:yt:smsLog:delete">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDeleteOrBatchDelete(null)"
+          >
+            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+          </Popconfirm>
+        </Authority>
+      </template>
+      <template #remark="{ record }">
+        <Tooltip :title="record.remark">
+          <div class="truncate w-full">{{ record.remark }}</div>
+        </Tooltip>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: '查看',
+              auth: 'api:yt:smsLog:get',
+              icon: 'ant-design:fund-view-outlined',
+              onClick: handleQuery.bind(null, record),
+            },
+            {
+              label: '删除',
+              auth: 'api:yt:smsLog:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
+    </BasicTable>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, h, nextTick } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { columns, searchFormSchema } from './sms.data';
+  import { Modal, Popconfirm, Tooltip } from 'ant-design-vue';
+  import { smsLogPage, deleteSmsLog } from '/@/api/message/records';
+  import { JsonPreview } from '/@/components/CodeEditor';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { Authority } from '/@/components/Authority';
+
+  export default defineComponent({
+    name: 'SmsLog',
+    components: { BasicTable, TableAction, Authority, Popconfirm, Tooltip },
+    setup() {
+      const [registerTable, { reload, setProps }] = useTable({
+        title: '短信发送列表',
+        api: smsLogPage,
+        columns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+          fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        actionColumn: {
+          width: 200,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: 'right',
+        },
+      });
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deleteSmsLog,
+        handleSuccess,
+        setProps
+      );
+      nextTick(() => {
+        setProps(selectionOptions);
+      });
+      function handleQuery(record: Recordable) {
+        Modal.info({
+          title: '消息内容',
+          width: 480,
+          centered: true,
+          maskClosable: true,
+          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(record.templateParam)) }),
+        });
+      }
+      // 导出 TODO:待做
+      const handleExport = () => {};
+      // 刷新表格
+      function handleSuccess() {
+        reload();
+      }
+
+      return {
+        hasBatchDelete,
+        registerTable,
+        handleExport,
+        handleQuery,
+        handleDeleteOrBatchDelete,
+      };
+    },
+  });
+</script>

+ 89 - 0
src/views/resource/plat/item/email.data.ts

@@ -0,0 +1,89 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
+import { useI18n } from '/@/hooks/web/useI18n';
+import moment from 'moment';
+const { t } = useI18n();
+export const columns: BasicColumn[] = [
+  {
+    title: '邮件主题',
+    dataIndex: 'emailSubject',
+    width: 160,
+  },
+  {
+    title: '收件人',
+    dataIndex: 'emailTo',
+    width: 160,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 100,
+    customRender: ({ record }) => {
+      const status = record.status;
+      const success = status === 'SUCCESS';
+      const color = success ? 'green' : 'red';
+      const successText: string = t('routes.common.system.tableSuccessStatus');
+      const failedText: string = t('routes.common.system.tableFailedStatus');
+      const text = success ? successText : failedText;
+      return h(Tag, { color: color }, () => text);
+    },
+  },
+  {
+    title: '用途',
+    dataIndex: 'templatePurposeDictText',
+    width: 160,
+  },
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 120,
+    slots: {
+      customRender: 'remark',
+    },
+  },
+  {
+    title: '发送时间',
+    dataIndex: 'sendTime',
+    width: 180,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'emailSubject',
+    label: '邮件主题',
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入邮件主题',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
+
+    colProps: { span: 6 },
+  },
+  {
+    field: 'sendTime',
+    label: '发送时间',
+    component: 'RangePicker',
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
+    },
+    colProps: { span: 6 },
+  },
+];

+ 74 - 0
src/views/resource/plat/item/sms.data.ts

@@ -0,0 +1,74 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
+import { useI18n } from '/@/hooks/web/useI18n';
+import moment from 'moment';
+const { t } = useI18n();
+export const columns: BasicColumn[] = [
+  {
+    title: '发送手机',
+    dataIndex: 'toPhone',
+    width: 160,
+  },
+  {
+    title: '短信平台',
+    dataIndex: 'typeDictText',
+    width: 160,
+  },
+  {
+    title: '用途',
+    dataIndex: 'templatePurposeDictText',
+    width: 160,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 100,
+    customRender: ({ record }) => {
+      const status = record.status;
+      const success = status === 'SUCCESS';
+      const color = success ? 'green' : 'red';
+      const successText: string = t('routes.common.system.tableSuccessStatus');
+      const failedText: string = t('routes.common.system.tableFailedStatus');
+      const text = success ? successText : failedText;
+      return h(Tag, { color: color }, () => text);
+    },
+  },
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 120,
+    slots: {
+      customRender: 'remark',
+    },
+  },
+  {
+    title: '发送时间',
+    dataIndex: 'sendTime',
+    width: 160,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'toPhone',
+    label: '发送手机',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 36,
+    },
+  },
+  {
+    field: 'sendTime',
+    label: '发送时间',
+    component: 'RangePicker',
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
+    },
+    colProps: { span: 6 },
+  },
+];

+ 2 - 2
src/views/systemAdmin/system/menu/index.vue

@@ -45,7 +45,7 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
 
   // 加载表格数据
-  import { getMenuList, delMenu } from '/@/api/sys/menu';
+  import { menuList, delMenu } from '/@/api/sys/menu';
   // 加载自定义侧边弹出框 组件
   import { useDrawer } from '/@/components/Drawer';
 
@@ -73,7 +73,7 @@
         { reload, collapseAll, getRowSelection, getSelectRowKeys, setSelectedRowKeys },
       ] = useTable({
         title: t('routes.common.system.pageSystemTitleMenuList'), //'菜单列表'
-        api: getMenuList, //加载数据
+        api: menuList, //加载数据
         columns, //加载列
         isTreeTable: true,
         pagination: false,

+ 33 - 32
src/views/systemAdmin/system/menu/menu.data.ts

@@ -15,19 +15,19 @@ export const columns: BasicColumn[] = [
     width: 180,
     align: 'left',
     customRender: ({ record }) => {
-      record = t(record.meta.title); //国际化处理
+      record = t(record.title); //国际化处理
       return record;
     },
   },
-  {
-    title: t('routes.common.system.tableTitleSystemIcon'), //图标
-    // title:'图标',
-    dataIndex: 'meta.icon',
-    width: 50,
-    customRender: ({ record }) => {
-      return h(Icon, { icon: record.meta.icon });
-    },
-  },
+  // {
+  //   title: t('routes.common.system.tableTitleSystemIcon'), //图标
+  //   // title:'图标',
+  //   dataIndex: 'meta.icon',
+  //   width: 50,
+  //   customRender: ({ record }) => {
+  //     return h(Icon, { icon: record.meta.icon });
+  //   },
+  // },
   {
     title: t('routes.common.system.tableTitleSystemPermissionTag'), //权限标识
     // title:'权限标识',
@@ -38,7 +38,8 @@ export const columns: BasicColumn[] = [
     title: t('routes.common.system.tableTitleSystemComponents'), //'组件'
     // title:'组件',
     width: 120,
-    dataIndex: 'component',
+    // dataIndex: 'component',
+    dataIndex: 'url',
   },
   {
     title: t('routes.common.system.tableTitleSystemSort'), //'排序'
@@ -46,27 +47,27 @@ export const columns: BasicColumn[] = [
     dataIndex: 'sort',
     width: 50,
   },
-  {
-    title: t('routes.common.system.tableTitleSystemStatus'), //'状态'
-    // title:'状态',
-    dataIndex: 'status',
-    width: 80,
-    customRender: ({ record }) => {
-      const status = record.meta.status;
-      const enable = ~~status === 0;
-      const color = enable ? 'green' : 'red';
-      const enableText: string = t('routes.common.system.tableTitleSystemEnable'); //国际化处理--启用
-      const stopText: string = t('routes.common.system.tableTitleSystemStop'); //国际化处理--停用
-      const text = enable ? enableText : stopText;
-      return h(Tag, { color: color }, () => text);
-    },
-  },
-  {
-    title: t('routes.common.system.tableTitleSystemCreateTime'), //'创建时间'
-    // title:'创建时间',
-    dataIndex: 'createTime',
-    width: 180,
-  },
+  // {
+  //   title: t('routes.common.system.tableTitleSystemStatus'), //'状态'
+  //   // title:'状态',
+  //   dataIndex: 'status',
+  //   width: 80,
+  //   customRender: ({ record }) => {
+  //     const status = record.meta.status;
+  //     const enable = ~~status === 0;
+  //     const color = enable ? 'green' : 'red';
+  //     const enableText: string = t('routes.common.system.tableTitleSystemEnable'); //国际化处理--启用
+  //     const stopText: string = t('routes.common.system.tableTitleSystemStop'); //国际化处理--停用
+  //     const text = enable ? enableText : stopText;
+  //     return h(Tag, { color: color }, () => text);
+  //   },
+  // },
+  // {
+  //   title: t('routes.common.system.tableTitleSystemCreateTime'), //'创建时间'
+  //   // title:'创建时间',
+  //   dataIndex: 'createTime',
+  //   width: 180,
+  // },
 ];
 
 const isDir = (type: string) => type === '0';