Jelajahi Sumber

字体不一样,button问题

Luolei 6 tahun lalu
induk
melakukan
6ca010f83a

+ 4 - 4
src/common/components/ConfirmModal/index.jsx

@@ -134,20 +134,20 @@ class ConfirmModal extends Component {
                         <div className={styles['modal-content']}>{children}</div>
                         {noFooter ? '' : <div className={styles['modal-operator']+' clearfix'}>
                             <div className={styles['modal-btn-box']}>
-                                <button 
+                                <div 
                                     onClick={this.confirm} 
                                     className={styles['modal-operator-confirm']}
                                     style={{borderColor: okBorderColor, background: oKBg, color: okColor}}>
                                     { okText}
-                                </button>
+                                </div>
                             </div>
                             <div className={styles['modal-btn-box']}>
-                                <button 
+                                <div 
                                 onClick={this.cancel} 
                                 className={styles['modal-operator-close']}
                                 style={{borderColor: cancelBorderColor, background: cancelBg, color: cancelColor}}>
                                 { cancelText}
-                            </button>
+                            </div>
                             </div>
                         </div>}
                     </div>

+ 1 - 1
src/common/components/ConfirmModal/index.less

@@ -46,7 +46,7 @@
     outline: none;
     margin: auto;
     height: 34px;
-    line-height: 24px;
+    line-height: 32px;
     opacity: 1;
     color: #fff;
     cursor: pointer;

+ 1 - 1
src/components/Inspect/index.jsx

@@ -150,7 +150,7 @@ class Inspect extends React.Component {
                     <span>化验结果数据</span>
                     <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}>
                        {/* <button disabled={ieVersion&&ieVersion>9?true:false}>导入化验结果</button>*/}
-                        <button>导入化验结果</button>
+                        <div className={styles.pushButton}>导入化验结果</div>
                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                     </div>
                 </div>

+ 3 - 4
src/components/Inspect/index.less

@@ -31,14 +31,13 @@
             color:@placeholder-color;
         }
     }
-    button {
-        outline: none;
+    .pushButton {
         font-size: 12px;
         padding: 0 8px;
         background-color: #fff;
         height: 28px;
-        line-height: 30px;
-        border: 0 none;
+        line-height: 28px;
+        border-radius: 5px;
         color: @template-color;
     }
 }

+ 5 - 5
src/components/Operation/index.jsx

@@ -273,11 +273,11 @@ class Operation extends Component {
     const { visible, preVisible,diagShow } = this.props.print;
     const {zIndex} = this.state;
     return <div className={style['container']} style={{zIndex:zIndex}}>
-      <button className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</button>
-      <button className={style['preButton']} onClick={showPreview}><img src={preview} /> 预览</button>
-      <button className={style['preButton']} onClick={() => { this.saveHis(3) }}><img src={saveHistory} /> 保存病历模板</button>
-      <button className={style['saveButton']} onClick={() => { this.saveAll(1) }}>保存</button>
-      <button className={`${style['clearButton']} ${style['saveButton']}`} onClick={() => { this.clearAll(2) }}>清除</button>
+      <span className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</span>
+      <span className={style['preButton']} onClick={showPreview}><img src={preview} /> 预览</span>
+      <span className={style['preButton']} onClick={() => { this.saveHis(3) }}><img src={saveHistory} /> 保存病历模板</span>
+      <span className={style['saveButton']} onClick={() => { this.saveAll(1) }}>保存</span>
+      <span className={`${style['clearButton']} ${style['saveButton']}`} onClick={() => { this.clearAll(2) }}>清除</span>
       <PrintPreviewContainer visible={visible} onClose={closePrint} />
       <PreviewContainer visible={preVisible} onClose={closePreview} />
       <ConfirmModal

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

@@ -45,11 +45,14 @@
     .saveButton {
         width: 80px;
         height: 34px;
+        line-height: 34px;
+        text-align: center;
         outline: none;
         border-radius: 4px;
         cursor: pointer;
         color: #000;
         border: 1px solid #3B9ED0;
+        box-sizing: border-box;
         background: #fff;
         margin-left:20px;
         background: #3B9ED0;

+ 0 - 1
src/store/async-actions/patInfo.js

@@ -21,7 +21,6 @@ export const initPersonInfo = (dispatch, getState) => {
         const data = res.data;
         if (data.code == 0) {
             dispatch(getInfos(data.data));
-            console.log(data.data)
             getPatientMessage(dispatch, getState);
         } else {
             console.log(res)