Selaa lähdekoodia

添加全局样式

luolei 5 vuotta sitten
vanhempi
commit
23e2e20908

+ 13 - 0
src/common/less/base.less

@@ -70,3 +70,16 @@ html,body {
 :global(.ql-align-right) {
 :global(.ql-align-right) {
     text-align: right;
     text-align: right;
 }
 }
+
+:global(.large-fontSize){
+    font-size: 18px !important;
+}
+:global(.simple-fontSize){
+    font-size: 14px !important;
+}
+:global(.dark-color){
+    color: #000 !important;
+}
+:global(.simple-color){
+    color: #ccc !important;
+}

+ 1 - 6
src/components/Operation/index.jsx

@@ -14,8 +14,6 @@ import {dragBox} from '@utils/drag';
 import store from '@store';
 import store from '@store';
 import $ from 'jquery';
 import $ from 'jquery';
 
 
-import loading from '@common/images/loading.gif';
-
 class Operation extends Component {
 class Operation extends Component {
   constructor(props) {
   constructor(props) {
     super(props)
     super(props)
@@ -287,7 +285,7 @@ class Operation extends Component {
   render() {
   render() {
     const { showPrint, closePrint, showPreview, closePreview } = this;
     const { showPrint, closePrint, showPreview, closePreview } = this;
     const { visible, preVisible,diagShow } = this.props.print;
     const { visible, preVisible,diagShow } = this.props.print;
-    const {winWidth,cancelDelTag,loadingShow} = this.props;
+    const {winWidth,cancelDelTag} = this.props;
     const {zIndex,type,le} = this.state;
     const {zIndex,type,le} = this.state;
     return <div className={style['container']} style={{left:le}}>
     return <div className={style['container']} style={{left:le}}>
       <span className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</span>
       <span className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</span>
@@ -299,9 +297,6 @@ class Operation extends Component {
       {visible?<PrintPreviewContainer visible={visible} onClose={closePrint} />:null}
       {visible?<PrintPreviewContainer visible={visible} onClose={closePrint} />:null}
       {preVisible?<PreviewContainer visible={preVisible} onClose={closePreview} />:null}
       {preVisible?<PreviewContainer visible={preVisible} onClose={closePreview} />:null}
       
       
-      {loadingShow?<div className={style['mask']}>
-          <img src={loading} className={style['load']}/>
-      </div>:""}
       <ConfirmModal
       <ConfirmModal
         visible={diagShow}        //改为全局控制
         visible={diagShow}        //改为全局控制
         confirm={() => { this.makeSure() }}
         confirm={() => { this.makeSure() }}

+ 0 - 21
src/components/Operation/index.less

@@ -169,24 +169,3 @@
     background: #D8D8D8;
     background: #D8D8D8;
 }
 }
 
 
-.mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: #000;
-    opacity: .4;
-    filter:alpha(opacity=40);
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=40);";
-    z-index: 100;
-}
-.load{
-    width: 40px;
-    height: 40px;
-    position: absolute;
-    top: 50%;
-    left:50%;
-    margin-top: -20px;
-    margin-left: -20px;
-}

+ 0 - 1
src/containers/OperationContainer.js

@@ -26,7 +26,6 @@ function mapStateToProps(state) {
     const {print,homePage} = state;
     const {print,homePage} = state;
     return ({
     return ({
         print,
         print,
-        loadingShow:homePage.loadingShow,
         winWidth:homePage.windowWidth,
         winWidth:homePage.windowWidth,
         chronicMagItem: state.diagnosticList.chronicMagItem,//慢病疾病
         chronicMagItem: state.diagnosticList.chronicMagItem,//慢病疾病
         chronicDesease:state.mainSuit.chronicDesease,//主诉存的慢病
         chronicDesease:state.mainSuit.chronicDesease,//主诉存的慢病