Explorar o código

Merge branch 'innterfaceUpdate' of http://192.168.2.236:10080/zhouna/newICSS into innterfaceUpdate

luolei %!s(int64=5) %!d(string=hai) anos
pai
achega
30eb9a3820

+ 1 - 1
src/common/less/base.less

@@ -50,7 +50,7 @@ button + button {
 html,body {
     font-size: @font-size-base; 
     // color: @B800;
-    background: @body-bg;
+    /*background: @body-bg;*/
 }
 :global(#root) {
     overflow: auto;

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

@@ -48,7 +48,7 @@ class EMRContainer extends Component {
         const contStyle={
                           opacity:'0.4',
                           top:'1px',
-                          right:'460px',
+                          right:'458px',
                           zIndex:'15',
                           width:'14px',
                           background:'#f1f1f1'};

+ 1 - 1
src/components/InfoTitle/index.less

@@ -9,7 +9,7 @@
   position: fixed;
   left: 10px;
   top: 50px;
-  right: 470px;
+  right: 468px;
   min-width: 548px;
   padding-right: 122px;
   .activeWrap {

+ 2 - 2
src/components/Operation/index.less

@@ -6,9 +6,9 @@
     position: fixed;
     bottom: 0;
     left: 10px;
-    right: 470px;
+    right: 468px;
     // min-width: 720px;
-    min-width: 548px;
+    min-width: 547px;
     background-color: #fff;
     // z-index: 240;
     padding-bottom: 10px;

+ 1 - 0
src/components/RadioInpDrop/index.jsx

@@ -207,6 +207,7 @@ class InputComp extends Component{
                  className={`${style['inner-inp']}`}
                  onClick={(e)=>{e.stopPropagation()}}
                  onFocus={(e)=>{e.stopPropagation()}}
+                 onMouseDown={(e)=>{e.stopPropagation()}}
                  onInput={this.handleInp}
                  onBlur={this.handleBlur}>&nbsp;</span>
   }