From 375fe2e4859a3948b00a52df829ba7972b1a72a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 11:07:07 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/resources/templates/react/Index.txt | 7 +++
zy-asrs-flow/src/pages/system/menu/index.jsx | 6 ++
zy-asrs-flow/src/pages/system/host/index.jsx | 6 ++
zy-asrs-flow/src/pages/system/role/index.jsx | 37 ++++++++++++------
zy-asrs-flow/src/pages/system/role/components/edit.jsx | 21 ++--------
zy-asrs-flow/src/pages/system/dept/index.jsx | 6 ++
zy-asrs-flow/src/pages/system/userLogin/index.jsx | 6 ++
7 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/dept/index.jsx b/zy-asrs-flow/src/pages/system/dept/index.jsx
index 1db8636..1cc463a 100644
--- a/zy-asrs-flow/src/pages/system/dept/index.jsx
+++ b/zy-asrs-flow/src/pages/system/dept/index.jsx
@@ -328,7 +328,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="dept"
diff --git a/zy-asrs-flow/src/pages/system/host/index.jsx b/zy-asrs-flow/src/pages/system/host/index.jsx
index e2f369e..e6aa3b7 100644
--- a/zy-asrs-flow/src/pages/system/host/index.jsx
+++ b/zy-asrs-flow/src/pages/system/host/index.jsx
@@ -219,7 +219,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="host"
diff --git a/zy-asrs-flow/src/pages/system/menu/index.jsx b/zy-asrs-flow/src/pages/system/menu/index.jsx
index c86ee75..c3edfea 100644
--- a/zy-asrs-flow/src/pages/system/menu/index.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/index.jsx
@@ -431,7 +431,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="menu"
diff --git a/zy-asrs-flow/src/pages/system/role/components/edit.jsx b/zy-asrs-flow/src/pages/system/role/components/edit.jsx
index 7dca9b1..de0b2f0 100644
--- a/zy-asrs-flow/src/pages/system/role/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/role/components/edit.jsx
@@ -83,26 +83,13 @@
]}
rules={[{ required: true, message: "璇烽�夋嫨鐘舵�侊紒" }]}
/>
- <ProFormDateTimePicker
- name="updateTime"
- label="淇敼鏃堕棿"
+ <ProFormText
+ name="memo"
+ label="澶囨敞"
colProps={{ md: 12, xl: 12 }}
- transform={(value) => {
- return moment(value).toISOString();
- }}
+ placeholder="璇疯緭鍏�"
/>
</ProForm.Group>
- <ProFormSelect
- name="hostId"
- label="鏈烘瀯"
- colProps={{ md: 12, xl: 12 }}
- showSearch
- debounceTime={300}
- request={async ({ keyWords }) => {
- const resp = await Http.doPostForm('api/host/query', { condition: keyWords });
- return resp.data;
- }}
- />
</ProForm>
</Modal>
</>
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index 6352839..19ffeff 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
@@ -11,6 +11,7 @@
import Http from '@/utils/http';
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
+import { statusMap } from '@/utils/enum-util'
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -104,13 +105,12 @@
title: 'No',
dataIndex: 'index',
valueType: 'indexBorder',
- width: 48,
+ width: 60,
},
{
title: '濮撳悕',
dataIndex: 'name',
valueType: 'text',
- copyable: true,
filterDropdown: (props) => <TextFilter
name='name'
{...props}
@@ -122,6 +122,7 @@
title: '鏍囪瘑',
dataIndex: 'code',
valueType: 'text',
+ copyable: true,
filterDropdown: (props) => <TextFilter
name='code'
{...props}
@@ -130,12 +131,12 @@
/>,
},
{
- title: '鏈烘瀯',
- dataIndex: 'hostId$',
+ title: '淇敼鏃堕棿',
+ dataIndex: 'updateTime$',
valueType: 'text',
- filterDropdown: (props) => <LinkFilter
- name='hostId'
- major='host'
+ width: 300,
+ filterDropdown: (props) => <DatetimeRangeFilter
+ name='updateTime'
{...props}
actionRef={actionRef}
setSearchParam={setSearchParam}
@@ -145,6 +146,7 @@
title: '鐘舵��',
dataIndex: 'status$',
valueType: 'text',
+ width: 160,
filterDropdown: (props) => <SelectFilter
name='status'
{...props}
@@ -155,13 +157,18 @@
{ label: '绂佺敤', value: 0 },
]}
/>,
+ render: (_, record) => {
+ const status = statusMap[record.status]
+ return <Tag color={status.color}>{status.text}</Tag>
+ },
},
{
- title: '淇敼鏃堕棿',
- dataIndex: 'updateTime$',
+ title: '澶囨敞',
+ dataIndex: 'memo',
valueType: 'text',
- filterDropdown: (props) => <DatetimeRangeFilter
- name='updateTime'
+ hidden: false,
+ filterDropdown: (props) => <TextFilter
+ name='memo'
{...props}
actionRef={actionRef}
setSearchParam={setSearchParam}
@@ -209,7 +216,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="role"
diff --git a/zy-asrs-flow/src/pages/system/userLogin/index.jsx b/zy-asrs-flow/src/pages/system/userLogin/index.jsx
index b151c90..39266d0 100644
--- a/zy-asrs-flow/src/pages/system/userLogin/index.jsx
+++ b/zy-asrs-flow/src/pages/system/userLogin/index.jsx
@@ -242,7 +242,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="userLogin"
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Index.txt b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
index f98ed08..a0ecaa8 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Index.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
@@ -11,6 +11,7 @@
import Http from '@/utils/http';
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
+import { statusMap } from '@/utils/enum-util'
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -149,7 +150,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="@{SIMPLEENTITYNAME}"
--
Gitblit v1.9.1