Merge branch 'dev5.4.1' into dev/new1

src/containers/DiagnosticItem.js

@@ -13,7 +13,7 @@ function mapStateToProps(state) {
     return {
         diagnosticList: state.diagnosticList.diagnosticList,
         mode:state.typeConfig.mode,
-        EMRScrollCont:inspect.context.scrollArea,             //滚动条对象
+        EMRScrollCont:state.inspect.context.scrollArea,             //滚动条对象
     }
 }