forked from huge/frontEnd/hugeOA

Mr Ke
2020-05-06 5519a3fbaf3e32244641fe9c7d6fe35333fb951e
修通知公告详情样式
5 files modified
110 ■■■■■ changed files
.gitignore 1 ●●●● patch | view | raw | blame | history
src/api/httpurl.js 4 ●●●● patch | view | raw | blame | history
src/components/page/DocumentDetailPage/index.jsx 73 ●●●●● patch | view | raw | blame | history
src/components/page/DocumentDetailPage/index.scss 30 ●●●●● patch | view | raw | blame | history
src/components/page/personal/information/index.jsx 2 ●●● patch | view | raw | blame | history
.gitignore
@@ -21,3 +21,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
build.zip
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地址
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">
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 {
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>
            {