From 75fa1bb87cf216dc4525d1a427924de464b03e80 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Tue, 14 Apr 2020 10:33:39 +0800
Subject: [PATCH] 修稿favicon、修改bug
---
src/components/common/MenuView/index.jsx | 2 +-
/dev/null | 0
public/index.html | 5 +++--
src/style/reset.scss | 4 ++++
public/favicon.png | 0
public/manifest.json | 12 +-----------
src/components/page/DocumentEditPage/index.jsx | 17 ++++++++++-------
src/components/common/HotListTableView/index.jsx | 4 +---
src/components/common/NotifyList/index.jsx | 4 ++--
src/api/httpurl.js | 4 ++--
10 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index bcd5dfd..0000000
--- a/public/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/public/favicon.png b/public/favicon.png
new file mode 100644
index 0000000..91f5279
--- /dev/null
+++ b/public/favicon.png
Binary files differ
diff --git a/public/index.html b/public/index.html
index 12508a4..63ad446 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,7 +9,8 @@
name="description"
content="Web site created using create-react-app"
/>
- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
+ <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" /> -->
+ <link rel="icon" class="js-site-favicon" type="image/svg+xml" href="./favicon.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,7 +25,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
- <title>恒巨科技</title>
+ <title>恒巨信息</title>
</head>
<body>
<!-- <noscript>You need to enable JavaScript to run this app.</noscript> -->
diff --git a/public/manifest.json b/public/manifest.json
index 080d6c7..c46a2cd 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -3,19 +3,9 @@
"name": "Create React App Sample",
"icons": [
{
- "src": "favicon.ico",
+ "src": "favicon.favicon.png",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
- },
- {
- "src": "logo192.png",
- "type": "image/png",
- "sizes": "192x192"
- },
- {
- "src": "logo512.png",
- "type": "image/png",
- "sizes": "512x512"
}
],
"start_url": ".",
diff --git a/src/api/httpurl.js b/src/api/httpurl.js
index 37c114e..8eac8d6 100644
--- a/src/api/httpurl.js
+++ b/src/api/httpurl.js
@@ -1,6 +1,6 @@
//内网测试地址
-// let StagingUrl = 'http://192.168.0.103:9072';
-let StagingUrl = "http://120.79.193.119:9072";
+let StagingUrl = 'http://192.168.0.114:9072';
+// let StagingUrl = "http://120.79.193.119:9072";
//mock地址
diff --git a/src/components/common/HotListTableView/index.jsx b/src/components/common/HotListTableView/index.jsx
index 7b6b778..b4f484e 100644
--- a/src/components/common/HotListTableView/index.jsx
+++ b/src/components/common/HotListTableView/index.jsx
@@ -71,9 +71,7 @@
dataIndex: 'title',
key: 'title',
render: (cur, item) => {
- return <a dangerouslySetInnerHTML={{ __html: cur }} onClick={() => {
- window.open(item.url)
- }}>
+ return <a dangerouslySetInnerHTML={{ __html: cur }} target="_blank" href={item.url} >
</a>
}
},
diff --git a/src/components/common/MenuView/index.jsx b/src/components/common/MenuView/index.jsx
index 378fbb7..12f1a65 100644
--- a/src/components/common/MenuView/index.jsx
+++ b/src/components/common/MenuView/index.jsx
@@ -30,7 +30,7 @@
document.title = `${name}`;
}
} else {
- document.title = `xx系统`;
+ document.title = `恒巨信息`;
}
const defaultOpenKeys = menudata.map(({ name }) => name);
diff --git a/src/components/common/NotifyList/index.jsx b/src/components/common/NotifyList/index.jsx
index 665d4d0..86d7c72 100644
--- a/src/components/common/NotifyList/index.jsx
+++ b/src/components/common/NotifyList/index.jsx
@@ -27,7 +27,7 @@
}).then(res => {
console.log('res', res);
this.setState({
- content: res.documentContent || ''
+ content: res.documentTitle || ''
})
})
}
@@ -41,7 +41,7 @@
renderDom = () => {
let { content } = this.state;
return <div className="notify-list-main-dom">
- <span className="notify-list-main-dom-msg">最新通知：公司本部从XX时间开始，调整省略很长很长的内容调整省略很长很长的内容公司本部从XX时间开始，调整省略很长很长的内容调整省略很长很长的内容公司本部从XX时间开始，调整省略很长很长的内容调整省略很长很长的内容</span>
+ <span className="notify-list-main-dom-msg">最新通知：{content}</span>
<span className="notify-list-main-dom-fuc" onClick={this.onClick}>[查看全部]</span>
</div>
}
diff --git a/src/components/page/DocumentEditPage/index.jsx b/src/components/page/DocumentEditPage/index.jsx
index 1a5b7fa..ba3c510 100644
--- a/src/components/page/DocumentEditPage/index.jsx
+++ b/src/components/page/DocumentEditPage/index.jsx
@@ -128,6 +128,9 @@
const { savedate, fileList, loading, disabled } = this.state;
const props = {
action: BASE_URL + `api/attachment/materials?associateId=${savedate.documentType == 'DT00002' ? 1001 : 1002}&entityId=` + savedate.id,
+ header: {
+ Authorization: window.localStorage.getItem('token')
+ },
onChange: ({ file, fileList }) => {
if (file.status !== 'uploading') {
console.log(file);
@@ -167,7 +170,7 @@
<Row gutter={16}>
<Col className="gutter-row" >
文档类型：
- </Col>
+ </Col>
</Row>
<Row gutter={16}>
<Col className="gutter-row" style={{ margin: '12px 0' }} >
@@ -186,7 +189,7 @@
<Row gutter={16} style={{ marginTop: '12px' }}>
<Col className="gutter-row" style={{ marginTop: '12px' }}>
通知标题：
- </Col>
+ </Col>
</Row>
}
{
@@ -194,7 +197,7 @@
<Row gutter={16} style={{ marginTop: '12px' }}>
<Col className="gutter-row" style={{ marginTop: '12px' }}>
规章制度标题：
- </Col>
+ </Col>
</Row>
}
<Row gutter={16}>
@@ -208,7 +211,7 @@
<Row gutter={16}>
<Col className="gutter-row" >
通知内容：
- </Col>
+ </Col>
</Row>
}
{
@@ -260,9 +263,9 @@
</Col>
</Row>
}
- <Row gutter={16} style={{ marginTop: '12px' }}>
- <Col span={2} className="gutter-row" ><Button disabled={disabled} style={{ marginRight: '15px', width: '100px' }} type="primary" loading={this.state.iconLoading} onClick={this.submit}>发布</Button></Col>
- <Col span={2} className="gutter-row" ><Button style={{ marginLeft: '15px', width: '100px' }} onClick={this.cancle}>返回</Button></Col>
+ <Row type="flex" gutter={20} style={{ marginTop: '12px' }}>
+ <Col className="gutter-row" ><Button onClick={this.cancle}>返回</Button></Col>
+ <Col className="gutter-row" ><Button disabled={disabled} type="primary" loading={this.state.iconLoading} onClick={this.submit}>发布</Button></Col>
</Row>
</Card>
</Spin>
diff --git a/src/style/reset.scss b/src/style/reset.scss
index 802dc2e..f77e00a 100644
--- a/src/style/reset.scss
+++ b/src/style/reset.scss
@@ -50,3 +50,7 @@
flex: 1;
overflow-y: auto;
}
+
+a:visited {
+ color: #559DE6; /*已访问的链接颜色*/
+}
\ No newline at end of file
--
Gitblit v1.8.0