diff --git a/web/client/src/app.js b/web/client/src/app.js index 82e4578..e615824 100644 --- a/web/client/src/app.js +++ b/web/client/src/app.js @@ -4,19 +4,29 @@ import React, { useEffect } from 'react'; import Layout from './layout'; import Auth from './sections/auth'; import homePage from './sections/homePage'; +import MetadataManagement from './sections/metadataManagement'; +import MetadataAcquisition from './sections/metadataAcquisition'; +import resourceConsumption from './sections/resourceConsumption'; +import resourceRetrieval from './sections/resourceRetrieval'; const App = props => { - const { projectName } = props + const { projectName } = props - useEffect(() => { - document.title = projectName; - }, []) + useEffect(() => { + document.title = projectName; + }, []) - return ( - - ) + return ( + + ) } diff --git a/web/client/src/components/Upload/index.js b/web/client/src/components/Upload/index.js index 9a1dad4..b9fa031 100644 --- a/web/client/src/components/Upload/index.js +++ b/web/client/src/components/Upload/index.js @@ -9,7 +9,7 @@ import { PlusOutlined, UploadOutlined, CloseOutlined } from '@ant-design/icons'; class Uploads extends Component { constructor(props) { super(props); - this.ApiRoot = API_ROOT + this.ApiRoot = FS_API_ROOT this.state = { fileUploading: false, fileList: [], @@ -109,10 +109,10 @@ class Uploads extends Component { video: ['mp4'] }; /** - * uploadType 【string】 主要区别文件上传路径 以及类型 以 web/routes/attachment/index.js 中 UploadPath 的 key 值为准;默认 project; + * uploadType 【string】 主要区别文件上传路径 以及类型 以 web/routes/attachment/index.js 中 UploadPath 的 key 值为准;默认 project; * disabled 【boolean】 上传是否可用 * maxFilesNum 【number】 最大上传数量 - * fileTypes 【array[string]】 可允许上传的文件类型; + * fileTypes 【array[string]】 可允许上传的文件类型; * maxFileSize 【number】 单个文件最大大小 M * listType 【antd】 upload 组件的属性 * onChange 【function】 文件数量变化时候回调 返回文件 @@ -149,13 +149,13 @@ class Uploads extends Component { return false; } if (file.name.length > 60) { - message.warning(`文件名过长(大于60字符),请修改后上传`); + message.warning(`文件名过长(大于60字符),请修改后上传`); return false; } const extNames = file.name.split('.'); var reg = /^[\.\s\u4e00-\u9fa5a-zA-Z0-9_-]{0,}$/; if (!reg.exec(file.name)) { - message.warning(`文件名包含除字母、汉字、数字、中划线、下划线之外的字符,请修改后上传`); + message.warning(`文件名包含除字母、汉字、数字、中划线、下划线之外的字符,请修改后上传`); return false; } let isDAE = false; @@ -210,7 +210,7 @@ class Uploads extends Component { that.setState({ fileUploading: false }); - message.error(`${info.file.name} 上传失败,请重试`); + message.error(`${info.file.name} 上传失败,请重试`); if (onStateChange) { onStateChange({ uploading: false }); } diff --git a/web/client/src/index.js b/web/client/src/index.js index f748dd7..4367f4d 100644 --- a/web/client/src/index.js +++ b/web/client/src/index.js @@ -4,4 +4,4 @@ import React from 'react'; import { render } from 'react-dom'; import App from './app'; -render((), document.getElementById('App')); \ No newline at end of file +render((), document.getElementById('App')); \ No newline at end of file diff --git a/web/client/src/layout/components/header/index.js b/web/client/src/layout/components/header/index.js index 9d5f354..77fbad3 100644 --- a/web/client/src/layout/components/header/index.js +++ b/web/client/src/layout/components/header/index.js @@ -39,7 +39,7 @@ const Header = props => { }
- 项目运管调度平台 + 政务数据资源中心