Sfoglia il codice sorgente

Merge branch 'dev/new1' into dev/zhangxc1

zhangxc 6 anni fa
parent
commit
37f085a3d7

+ 1 - 1
index.html

@@ -8,6 +8,6 @@
     <title>ICSS</title>
 </head>
 <body>
-<div id="root" style="min-width: 1024px;"></div>
+<div id="root" style="min-width: 1024px;overflow-y: hidden;"></div>
 </body>
 </html>

+ 1 - 1
src/common/less/reset.css

@@ -23,7 +23,7 @@ html, body {
     height: 100%;
 	/*overflow-x: hidden;*/
   font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
-  overflow: hidden;    /* 弹窗出现有可能出现滚动条*/
+	/*overflow-y: hidden;     弹窗出现有可能出现滚动条*/
 }
 
 body {

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

@@ -332,7 +332,7 @@ class Operation extends Component {
     const { visible, preVisible,diagShow } = this.props.print;
     const {winWidth} = this.props;
     const {zIndex,type,le} = this.state;
-    return <div className={style['container']} style={{zIndex:zIndex}}>
+    return <div className={style['container']} style={{zIndex:zIndex,left:le}}>
       <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>

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

@@ -7,6 +7,7 @@
     left: 10px;
     right: 470px;
     // min-width: 720px;
+    min-width: 548px;
     background-color: #fff;
     // z-index: 240;
     padding-bottom: 10px;