优化细节
This commit is contained in:
@@ -34,6 +34,7 @@ import {
|
||||
SafetyCertificateOutlined,
|
||||
ToolOutlined,
|
||||
RightOutlined,
|
||||
EyeOutlined,
|
||||
} from '@ant-design/icons';
|
||||
import {
|
||||
Smartphone,
|
||||
@@ -367,7 +368,16 @@ const BasicSettings = () => {
|
||||
</Space>
|
||||
)
|
||||
},
|
||||
{ title: '操作', key: 'action', width: 60, render: () => <Button type="link" size="small" style={{ padding: 0, fontSize: 11 }}>查看</Button>, fixed: 'right' },
|
||||
{
|
||||
title: '操作', key: 'action', width: 60, render: () => <Button
|
||||
type="link"
|
||||
size="small"
|
||||
icon={<EyeOutlined />}
|
||||
style={{ padding: 0, fontSize: 11 }}
|
||||
>
|
||||
查看
|
||||
</Button>, fixed: 'right'
|
||||
},
|
||||
]}
|
||||
dataSource={[
|
||||
{ name: '张运维', role: '超级管理员', phone: '138****0001', email: 'zhangyw@pvsmart.com', status: '在线' },
|
||||
|
||||
@@ -121,7 +121,7 @@ export default function Organization() {
|
||||
|
||||
const columns = [
|
||||
{ title: '组织名称', dataIndex: 'orgName' },
|
||||
{ title: '组织编码', dataIndex: 'orgCode' },
|
||||
//{ title: '组织编码', dataIndex: 'orgCode' },
|
||||
{ title: '负责人', dataIndex: 'manager' },
|
||||
{ title: '联系电话', dataIndex: 'phone' },
|
||||
{ title: '邮箱', dataIndex: 'email' },
|
||||
@@ -189,9 +189,9 @@ export default function Organization() {
|
||||
<Input placeholder="请输入组织名称" />
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item name="orgCode" label="组织编码" rules={[{ required: true }]}>
|
||||
{/*<Form.Item name="orgCode" label="组织编码" rules={[{ required: true }]}>
|
||||
<Input placeholder="请输入组织编码" />
|
||||
</Form.Item>
|
||||
</Form.Item>*/}
|
||||
|
||||
<Form.Item name="manager" label="负责人" rules={[{ required: true, message: '请输入负责人' }]}>
|
||||
<Input placeholder="请输入负责人" />
|
||||
|
||||
@@ -7,6 +7,11 @@ import QRCode from 'qrcode';
|
||||
import DictManager from "../DictManager";
|
||||
import request from '../../api/request';
|
||||
import { Country, State } from 'country-state-city';
|
||||
import {
|
||||
EyeOutlined,
|
||||
EditOutlined,
|
||||
DeleteOutlined,
|
||||
} from '@ant-design/icons';
|
||||
|
||||
// 接口导入
|
||||
import {
|
||||
@@ -378,12 +383,14 @@ const SerialNumGenerate = () => {
|
||||
fixed: "right",
|
||||
render: (_, r) => (
|
||||
<Space>
|
||||
<Button type="link" onClick={() => handleView(r)}>查看</Button>
|
||||
<Button type="link" icon={<EyeOutlined />} onClick={() => handleView(r)}>查看</Button>
|
||||
<Popconfirm
|
||||
title="确定删除?"
|
||||
onConfirm={() => handleDelete(r.id)}
|
||||
>
|
||||
<Button type="link" danger>删除</Button>
|
||||
<Button type="link" danger icon={<DeleteOutlined />} >
|
||||
删除
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
</Space>
|
||||
)
|
||||
|
||||
@@ -225,7 +225,7 @@ export default function StationManage() {
|
||||
// ====================== 表格列 ======================
|
||||
const columns = [
|
||||
{ title: '场站名称', dataIndex: 'siteName' },
|
||||
{ title: '场站编号', dataIndex: 'siteCode' },
|
||||
//{ title: '场站编号', dataIndex: 'siteCode' },
|
||||
{
|
||||
title: '所属组织',
|
||||
dataIndex: 'orgId',
|
||||
@@ -316,21 +316,19 @@ export default function StationManage() {
|
||||
</Form.Item>
|
||||
</Col>
|
||||
<Col span={12}>
|
||||
<Form.Item name="siteCode" label="场站编号" rules={[{ required: true }]}>
|
||||
<Input placeholder="唯一编码" />
|
||||
<Form.Item name="orgId" label="所属组织" rules={[{ required: true }]}>
|
||||
<Select placeholder="请选择所属组织" allowClear>
|
||||
{orgList.map(item => (
|
||||
<Option key={item.id} value={item.id}>
|
||||
{item.orgName}
|
||||
</Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
<Form.Item name="orgId" label="所属组织" rules={[{ required: true }]}>
|
||||
<Select placeholder="请选择所属组织" allowClear>
|
||||
{orgList.map(item => (
|
||||
<Option key={item.id} value={item.id}>
|
||||
{item.orgName}
|
||||
</Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
|
||||
|
||||
<Row gutter={16}>
|
||||
<Col span={12}>
|
||||
|
||||
Reference in New Issue
Block a user