From 5519a3fbaf3e32244641fe9c7d6fe35333fb951e Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 06 May 2020 10:48:56 +0800
Subject: [PATCH] 修通知公告详情样式
---
src/components/page/DocumentDetailPage/index.jsx | 73 ++++++++++++++----------------------
.gitignore | 1
src/components/page/DocumentDetailPage/index.scss | 30 ++++++++++++++
src/components/page/personal/information/index.jsx | 2
src/api/httpurl.js | 4 +-
5 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4d29575..ce85e70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
+build.zip
diff --git a/src/api/httpurl.js b/src/api/httpurl.js
index 0244c8a..5285521 100644
--- a/src/api/httpurl.js
+++ b/src/api/httpurl.js
@@ -1,6 +1,6 @@
//内网测试地址
-let StagingUrl = 'http://192.168.0.116:9072';
-// let StagingUrl = "http://120.79.193.119:9072";
+// let StagingUrl = 'http://192.168.0.116:9072';
+let StagingUrl = "http://120.79.193.119:9072";
//mock地址
diff --git a/src/components/page/DocumentDetailPage/index.jsx b/src/components/page/DocumentDetailPage/index.jsx
index 3ae3663..24bc71a 100644
--- a/src/components/page/DocumentDetailPage/index.jsx
+++ b/src/components/page/DocumentDetailPage/index.jsx
@@ -13,7 +13,8 @@
const { TextArea } = Input;
import fetch from '../../../api/request';
-import { BASE_URL } from '../../../api/httpurl'
+import { BASE_URL } from '../../../api/httpurl';
+import moment from 'moment';
const param = [{ value: 'DT00002', name: '通知公告' }, { value: 'DT00001', name: '规章制度' }]
export default class DocumentDetailPage extends Component {
@@ -158,55 +159,39 @@
<Spin spinning={loading}>
<Card style={{ border: 20, margin: 20, padding: 20 }}>
- <Row gutter={16}>
- <Col className="gutter-row marginTop flex-box-row" >
- <div className="document-detail-page-main-label">
- 文档类型：
- </div>
- <div className="document-detail-page-main-value">
- {
- saveData.documentType ? param.find(({ value }) => value == saveData.documentType).name : '无'
- }
- </div>
- </Col>
+ <Row className="document-detail-page-main-title">
+ {saveData.documentTitle || '无'}
</Row>
- <Row gutter={16} className="marginTop">
- <Col className="gutter-row marginTop flex-box-row">
- <div className="document-detail-page-main-label">
- {saveData.documentType && this.switchWordByType(saveData.documentType).title}标题：
- </div>
- <div className="document-detail-page-main-value">
- {saveData.documentTitle || '无'}
- </div>
- </Col>
+ <Row className="document-detail-page-main-documentType marginTop">
+ <div className="marginTop">
+ {
+ saveData.documentType ? param.find(({ value }) => value == saveData.documentType).name : '无'
+ }
+ </div>
</Row>
- <Row gutter={16} className="marginTop">
- <Col className="gutter-row marginTop flex-box-row flex-start">
- <div className="document-detail-page-main-label">
- 通知内容：
- </div>
- <div className="flex-1">
- {
- saveData.documentContent ? <div dangerouslySetInnerHTML={{
- __html: saveData.documentContent
- }} style={{ width: '70%' }} /> : <div className="document-detail-page-main-value">
- 无
+ <Row className="document-detail-page-main-detail marginTop">
+ <Row gutter={16} type="flex" className="marginTop">
+ <Col>广州恒巨信息科技有限公司</Col>
+ <Col>{saveData.createTime && moment(saveData.createTime).format("YYYY-MM-DD HH:mm")}</Col>
+ </Row>
+ <Row className="marginTop">
+ {saveData.readNumber}人已读，{saveData.noticeNumber - saveData.readNumber}人未读
+ </Row>
+ </Row>
+
+ <Row className="marginTop">
+ <div>
+ {
+ saveData.documentContent ? <div dangerouslySetInnerHTML={{
+ __html: saveData.documentContent
+ }} style={{ width: '70%' }} /> : <div className="document-detail-page-main-value">
+ 无
</div>
- }
- </div>
-
- </Col>
+ }
+ </div>
</Row>
-
- {/* 当有富文本内容的时候 -- 显示 */}
- {/* {
- saveData.documentContent &&
- <div dangerouslySetInnerHTML={{
- __html: saveData.documentContent
- }} style={{ width: '70%' }} className="marginTB" />
- } */}
<Row gutter={16} className="marginTop">
<Col className="gutter-row marginTop flex-box-row flex-start">
diff --git a/src/components/page/DocumentDetailPage/index.scss b/src/components/page/DocumentDetailPage/index.scss
index 9cbfc5f..eb34c86 100644
--- a/src/components/page/DocumentDetailPage/index.scss
+++ b/src/components/page/DocumentDetailPage/index.scss
@@ -9,7 +9,35 @@
.document-detail-page {
&-main {
- & p{
+ &-title {
+ font-family: PingFangSC-Medium;
+ font-size: 18px;
+ color: #343434;
+ line-height: 26px;
+ }
+ &-documentType div {
+ line-height: 25px;
+ position: relative;
+ display: inline-block;
+ font-weight: 400;
+ white-space: nowrap;
+ text-align: center;
+ background-image: none;
+ border: 1px solid transparent;
+ height: 28px;
+ padding: 0 15px;
+ font-size: 14px;
+ border-radius: 4px;
+ color: #559de6;
+ background-color: #fff;
+ border-color: #559de6;
+ }
+ &-detail {
+ font-family: PingFangSC-Medium;
+ font-size: 14px;
+ color: #989898;
+ }
+ & p {
margin: 1px 0;
}
&-label {
diff --git a/src/components/page/personal/information/index.jsx b/src/components/page/personal/information/index.jsx
index 9e06fe0..5006757 100644
--- a/src/components/page/personal/information/index.jsx
+++ b/src/components/page/personal/information/index.jsx
@@ -251,7 +251,7 @@
</Card>
<Row type="flex" gutter={20} style={{ marginTop: '12px' }}>
- <Col className="gutter-row" ><Button onClick={() => { history.goBack() }}>返回</Button></Col>
+ {/* <Col className="gutter-row" ><Button onClick={() => { history.goBack() }}>返回</Button></Col> */}
<Col className="gutter-row" ><Button type="primary" loading={submitLoading} onClick={this.handleSubmit}>确定</Button></Col>
</Row>
{
--
Gitblit v1.8.0