Browse Source

Merge branch 'dev5.3.1' of http://192.168.2.236:10080/zhouna/newICSS into dev5.3.1

liucf 5 years ago
parent
commit
919d54d0ae
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/components/TreatDesc/index.less
  2. 1 1
      src/store/async-actions/fetchModules.js

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

@@ -44,7 +44,7 @@
     height: 100%;
     height: 100%;
     top: 0;
     top: 0;
     background: #fff;
     background: #fff;
-    padding: 40px  0 20px 20px;
+    padding: 60px  20px 20px 20px;
     box-shadow: 2px 0px 5px -2px #7d7c7c;
     box-shadow: 2px 0px 5px -2px #7d7c7c;
 }
 }
 .similar-drug {
 .similar-drug {

+ 1 - 1
src/store/async-actions/fetchModules.js

@@ -3,7 +3,7 @@ import {SET,PRESET} from '@types/checkBody';
 import {SETDATA} from '@store/types/otherHistory';
 import {SETDATA} from '@store/types/otherHistory';
 import store from '@store';
 import store from '@store';
 import {getEMRParams,didPushParamChange,inspectAndAssist,fullfillText,checkFullfillText,deepClone,filterDataArr} from '@utils/tools';
 import {getEMRParams,didPushParamChange,inspectAndAssist,fullfillText,checkFullfillText,deepClone,filterDataArr} from '@utils/tools';
-import {Notify} from '@commonComp';
+import  Notify from '@commonComp/Notify';
 import {billing} from '@store/async-actions/pushMessage';
 import {billing} from '@store/async-actions/pushMessage';
 import {SETOTHERHISTORY,ISREAD} from "../types/homePage";
 import {SETOTHERHISTORY,ISREAD} from "../types/homePage";
 import config from "@config/index";
 import config from "@config/index";