From b8342288dd6ca88e50b033d1dfe03f334738cdbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Mon, 28 Jun 2021 13:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/index.scss                    | 30 ++++++++++++++++++++++
 src/military/notice/noticeDetail/index.jsx |  7 +++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/military/index.scss b/src/military/index.scss
index e09fba2e..7c6858e2 100644
--- a/src/military/index.scss
+++ b/src/military/index.scss
@@ -142,6 +142,36 @@
   text-align: left;
 }
 
+// 富文本样式
+.w-e-text table td, .w-e-text table th{
+  height: 30px;
+}
+.editor-w-text table td, .editor-w-text table th{
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  padding: 3px 5px;
+  height: 30px;
+  min-height: 30px;
+}
+.editor-w-text table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+  background-color: #f1f1f1;
+}
+.editor-w-text table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+.editor-w-text blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+
 
 @media screen and (max-width: 1200px){
   .centerbox {
diff --git a/src/military/notice/noticeDetail/index.jsx b/src/military/notice/noticeDetail/index.jsx
index c7024f63..cd863d48 100644
--- a/src/military/notice/noticeDetail/index.jsx
+++ b/src/military/notice/noticeDetail/index.jsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Icon, } from 'antd';
 import { Link } from "react-router-dom";
-import { httpUrl } from '../../fetch';
 import { getNoticeDetail } from '../api';
 import { noticeType } from '../static';
 import './index.scss';
@@ -51,7 +50,7 @@ export default ({ match, history, showNotification }) => {
 
             <div className="content-text">
               <div className="notice-content-title"><Icon type="caret-right" />公告主要内容</div>
-              <div dangerouslySetInnerHTML={{ __html: noticeData.text }}>
+              <div className="editor-w-text" dangerouslySetInnerHTML={{ __html: noticeData.text }}>
               </div>
             </div>
 
@@ -60,10 +59,10 @@ export default ({ match, history, showNotification }) => {
               <React.Fragment>
                 <div className="notice-content-title"><Icon type="caret-right" />公告附件</div>
                 <p className="notice-content-download"  >
-                  <span onClick={() => { window.open(httpUrl + noticeData.fileDownloadPath) }}>
+                  <span onClick={() => { window.open( noticeData.fileDownloadPath) }}>
                     <i className="iconfont icon-fujian color-green font-14 mr3"></i>{noticeData.fileName}
                   </span>
-                  <span className="link" onClick={() => { window.open(httpUrl + noticeData.fileDownloadPath) }}>下载</span>
+                  <span className="link" onClick={() => { window.open( noticeData.fileDownloadPath) }}>下载</span>
                 </p>
               </React.Fragment>
             }