{
display: 'flex',
height: 26,
}}
- onClick={() => {
- window.open('https://pro.ant.design/docs/getting-started');
- }}
+ // onClick={() => {
+ // window.open('https://pro.ant.design/docs/getting-started');
+ // }}
>
diff --git a/src/components/index.ts b/src/components/index.ts
index ca88a6d07d..33aa76e6a1 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -6,7 +6,6 @@
* 布局组件
*/
import Footer from './Footer';
-import { Question, SelectLang } from './RightContent';
+import { Question } from './RightContent';
import { AvatarDropdown, AvatarName } from './RightContent/AvatarDropdown';
-
-export { Footer, Question, SelectLang, AvatarDropdown, AvatarName };
+export { AvatarDropdown, AvatarName, Footer, Question };
diff --git a/src/global.tsx b/src/global.tsx
index afa1fab566..db2c2969f3 100644
--- a/src/global.tsx
+++ b/src/global.tsx
@@ -1,10 +1,8 @@
-import { useIntl } from '@umijs/max';
+import '@umijs/max';
import { Button, message, notification } from 'antd';
import defaultSettings from '../config/defaultSettings';
-
const { pwa } = defaultSettings;
const isHttps = document.location.protocol === 'https:';
-
const clearCache = () => {
// remove all caches
if (window.caches) {
@@ -23,7 +21,7 @@ const clearCache = () => {
if (pwa) {
// Notify user if offline now
window.addEventListener('sw.offline', () => {
- message.warning(useIntl().formatMessage({ id: 'app.pwa.offline' }));
+ message.warning('当前处于离线状态');
});
// Pop up a prompt on the page asking the user if they want to use the latest version
@@ -46,9 +44,13 @@ if (pwa) {
resolve(msgEvent.data);
}
};
- worker.postMessage({ type: 'skip-waiting' }, [channel.port2]);
+ worker.postMessage(
+ {
+ type: 'skip-waiting',
+ },
+ [channel.port2],
+ );
});
-
clearCache();
window.location.reload();
return true;
@@ -62,12 +64,12 @@ if (pwa) {
reloadSW();
}}
>
- {useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated.ok' })}
+ {'刷新'}
);
notification.open({
- message: useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated' }),
- description: useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
+ message: '有新内容',
+ description: '请点击“刷新”按钮或者手动刷新页面',
btn,
key,
onClose: async () => null,
@@ -86,6 +88,5 @@ if (pwa) {
serviceWorker.getRegistration().then((sw) => {
if (sw) sw.unregister();
});
-
clearCache();
}
diff --git a/src/locales/bn-BD/pages.ts b/src/locales/bn-BD/pages.ts
index 07e0cf1692..b621d34dcd 100644
--- a/src/locales/bn-BD/pages.ts
+++ b/src/locales/bn-BD/pages.ts
@@ -5,7 +5,7 @@ export default {
'pages.login.accountLogin.errorMessage': 'ভুল ব্যবহারকারীর নাম/পাসওয়ার্ড(admin/ant.design)',
'pages.login.failure': 'লগইন ব্যর্থ হয়েছে। আবার চেষ্টা করুন!',
'pages.login.success': 'সফল লগইন!',
- 'pages.login.username.placeholder': 'ব্যবহারকারীর নাম: admin or user',
+ 'pages.login.username.placeholder': 'ব্যবহারকারীর নাম',
'pages.login.username.required': 'আপনার ব্যবহারকারীর নাম ইনপুট করুন!',
'pages.login.password.placeholder': 'পাসওয়ার্ড: ant.design',
'pages.login.password.required': 'আপনার পাসওয়ার্ড ইনপুট করুন!',
diff --git a/src/locales/en-US/pages.ts b/src/locales/en-US/pages.ts
index 3334c03057..43b7f67784 100644
--- a/src/locales/en-US/pages.ts
+++ b/src/locales/en-US/pages.ts
@@ -5,7 +5,7 @@ export default {
'pages.login.accountLogin.errorMessage': 'Incorrect username/password(admin/ant.design)',
'pages.login.failure': 'Login failed, please try again!',
'pages.login.success': 'Login successful!',
- 'pages.login.username.placeholder': 'Username: admin or user',
+ 'pages.login.username.placeholder': 'Username',
'pages.login.username.required': 'Please input your username!',
'pages.login.password.placeholder': 'Password: ant.design',
'pages.login.password.required': 'Please input your password!',
diff --git a/src/locales/id-ID/pages.ts b/src/locales/id-ID/pages.ts
index de28ef3668..49ae4aeb25 100644
--- a/src/locales/id-ID/pages.ts
+++ b/src/locales/id-ID/pages.ts
@@ -5,7 +5,7 @@ export default {
'pages.login.accountLogin.errorMessage': 'Nama pengguna dan kata sandi salah(admin/ant.design)',
'pages.login.failure': 'Log masuk gagal, silakan coba lagi!',
'pages.login.success': 'Login berhasil!',
- 'pages.login.username.placeholder': 'nama pengguna: admin atau user',
+ 'pages.login.username.placeholder': 'nama pengguna',
'pages.login.username.required': 'Nama pengguna harus diisi!',
'pages.login.password.placeholder': 'kata sandi: ant.design',
'pages.login.password.required': 'Kata sandi harus diisi!',
diff --git a/src/locales/pt-BR/pages.ts b/src/locales/pt-BR/pages.ts
index 6a96e9b889..807fc75a3d 100644
--- a/src/locales/pt-BR/pages.ts
+++ b/src/locales/pt-BR/pages.ts
@@ -5,7 +5,7 @@ export default {
'pages.login.accountLogin.errorMessage': 'usuário/senha incorreto(admin/ant.design)',
'pages.login.failure': 'Login falhou, por favor tente novamente!',
'pages.login.success': 'Login efetuado com sucesso!',
- 'pages.login.username.placeholder': 'Usuário: admin or user',
+ 'pages.login.username.placeholder': 'Usuário',
'pages.login.username.required': 'Por favor insira seu usuário!',
'pages.login.password.placeholder': 'Senha: ant.design',
'pages.login.password.required': 'Por favor insira sua senha!',
diff --git a/src/locales/zh-CN/menu.ts b/src/locales/zh-CN/menu.ts
index fecb70a40f..29b619f7eb 100644
--- a/src/locales/zh-CN/menu.ts
+++ b/src/locales/zh-CN/menu.ts
@@ -22,8 +22,8 @@ export default {
'menu.form.step-form.result': '分步表单（完成）',
'menu.form.advanced-form': '高级表单',
'menu.list': '列表页',
- 'menu.list.table-list': '查询表格',
- 'menu.list.basic-list': '标准列表',
+ 'menu.list.table-list': '设备列表',
+ 'menu.list.basic-list': '记录列表',
'menu.list.card-list': '卡片列表',
'menu.list.search-list': '搜索列表',
'menu.list.search-list.articles': '搜索列表（文章）',
diff --git a/src/locales/zh-CN/pages.ts b/src/locales/zh-CN/pages.ts
index a266bc6ca5..4d6fa5bfc0 100644
--- a/src/locales/zh-CN/pages.ts
+++ b/src/locales/zh-CN/pages.ts
@@ -1,12 +1,12 @@
export default {
'pages.layouts.userLayout.title': 'Ant Design 是西湖区最具影响力的 Web 设计规范',
'pages.login.accountLogin.tab': '账户密码登录',
- 'pages.login.accountLogin.errorMessage': '错误的用户名和密码(admin/ant.design)',
+ 'pages.login.accountLogin.errorMessage': '错误的用户名和密码',
'pages.login.failure': '登录失败，请重试！',
'pages.login.success': '登录成功！',
- 'pages.login.username.placeholder': '用户名: admin or user',
+ 'pages.login.username.placeholder': '用户名',
'pages.login.username.required': '用户名是必填项！',
- 'pages.login.password.placeholder': '密码: ant.design',
+ 'pages.login.password.placeholder': '密码',
'pages.login.password.required': '密码是必填项！',
'pages.login.phoneLogin.tab': '手机号登录',
'pages.login.phoneLogin.errorMessage': '验证码错误',
@@ -31,7 +31,7 @@ export default {
'pages.searchTable.createForm.newRule': '新建规则',
'pages.searchTable.updateForm.ruleConfig': '规则配置',
'pages.searchTable.updateForm.basicConfig': '基本信息',
- 'pages.searchTable.updateForm.ruleName.nameLabel': '规则名称',
+ 'pages.searchTable.updateForm.ruleName.nameLabel': '名称',
'pages.searchTable.updateForm.ruleName.nameRules': '请输入规则名称！',
'pages.searchTable.updateForm.ruleDesc.descLabel': '规则描述',
'pages.searchTable.updateForm.ruleDesc.descPlaceholder': '请输入至少五个字符',
@@ -45,10 +45,10 @@ export default {
'pages.searchTable.updateForm.schedulingPeriod.timeRules': '请选择开始时间！',
'pages.searchTable.titleDesc': '描述',
'pages.searchTable.ruleName': '规则名称为必填项',
- 'pages.searchTable.titleCallNo': '服务调用次数',
+ 'pages.searchTable.titleCallNo': '本机IP',
'pages.searchTable.titleStatus': '状态',
- 'pages.searchTable.nameStatus.default': '关闭',
- 'pages.searchTable.nameStatus.running': '运行中',
+ 'pages.searchTable.nameStatus.default': '离线',
+ 'pages.searchTable.nameStatus.running': '在线',
'pages.searchTable.nameStatus.online': '已上线',
'pages.searchTable.nameStatus.abnormal': '异常',
'pages.searchTable.titleUpdatedAt': '上次调度时间',
diff --git a/src/locales/zh-TW/pages.ts b/src/locales/zh-TW/pages.ts
index 37000c0145..e66e414c45 100644
--- a/src/locales/zh-TW/pages.ts
+++ b/src/locales/zh-TW/pages.ts
@@ -4,7 +4,7 @@ export default {
'pages.login.accountLogin.errorMessage': '錯誤的用戶名和密碼(admin/ant.design)',
'pages.login.failure': '登錄失敗，請重試！',
'pages.login.success': '登錄成功！',
- 'pages.login.username.placeholder': '用戶名: admin or user',
+ 'pages.login.username.placeholder': '用戶名',
'pages.login.username.required': '用戶名是必填項！',
'pages.login.password.placeholder': '密碼: ant.design',
'pages.login.password.required': '密碼是必填項！',
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index 469356750c..42b3a15026 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -1,18 +1,16 @@
-import { history, useIntl } from '@umijs/max';
+import { history } from '@umijs/max';
import { Button, Result } from 'antd';
import React from 'react';
-
const NoFoundPage: React.FC = () => (
+
Want to add more pages? Please refer to{' '} use block @@ -41,5 +41,4 @@ const Admin: React.FC = () => {
{entity.name}
+
);
},
},
{
- title: {entity.name}
+
+ );
+ },
+ },
+ {
+ title: '类型',
+ dataIndex: 'format',
+ valueType: 'select',
+ valueEnum: {
+ CF_TEXT: {
+ text: '文本',
+ },
+ CF_BITMAP: {
+ text: '图片',
+ },
+ },
+ },
+ {
+ title: '内容',
+ dataIndex: 'content',
+ sorter: true,
+ hideInForm: true,
+ width: '60%',
+ },
+ {
+ title: '地址',
+ dataIndex: 'detected_address',
+ hideInSearch: true,
+ },
+ {
+ title: '时间',
+ sorter: true,
+ dataIndex: 'timestamp',
+ valueType: 'dateTime',
+ },
+ {
+ title: '操作',
+ dataIndex: 'option',
+ valueType: 'option',
+ render: (_, record) => [
+
- {SelectLang &&
- );
+ return;
};
-
const LoginMessage: React.FC<{
content: string;
}> = ({ content }) => {
@@ -94,14 +84,11 @@ const LoginMessage: React.FC<{
/>
);
};
-
const Login: React.FC = () => {
const [userLoginState, setUserLoginState] = useState
}
- title="Ant Design"
- subTitle={intl.formatMessage({ id: 'pages.layouts.userLayout.title' })}
+ title="管理端"
+ subTitle="舟窗尽落，清风徐来"
initialValues={{
autoLogin: true,
}}
- actions={[
-
-
-
- 欢迎使用 Ant Design Pro
-
- - Ant Design Pro 是一个整合了 umi，Ant Design 和 ProComponents - 的脚手架方案。致力于在设计规范和基础组件的基础上，继续向上构建，提炼出典型模板/业务组件/配套设计资源，进一步提升企业级中后台产品设计研发过程中的『用户』和『设计者』的体验。 -
-
-
-
+
+
+
+
+ );
+};
+
+export default StatsPage;
diff --git a/src/services/ant-design-pro/api.ts b/src/services/ant-design-pro/api.ts
index b42bdfcffa..3f65495ee0 100644
--- a/src/services/ant-design-pro/api.ts
+++ b/src/services/ant-design-pro/api.ts
@@ -6,7 +6,7 @@ import { request } from '@umijs/max';
export async function currentUser(options?: { [key: string]: any }) {
return request<{
data: API.CurrentUser;
- }>('/api/currentUser', {
+ }>('https://867t766n6.zicp.fun/api/currentUser', {
method: 'GET',
...(options || {}),
});
@@ -14,7 +14,7 @@ export async function currentUser(options?: { [key: string]: any }) {
/** 退出登录接口 POST /api/login/outLogin */
export async function outLogin(options?: { [key: string]: any }) {
- return request