Merge remote-tracking branch 'origin/master'

.idea/ah_jjzhgd_webscreen.iml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

js/pages/newDataAnalysis/newDataAnalysis.js

@@ -44,7 +44,7 @@ function changeData(that, type) {
   }else if(type == 8){ // 项目管理分析
     src = '';
   }else if(type == 9){ // 整体效能分析
-    src = '';
+    src = 'overallEfficiency.html';
   }else if(type == 10){ // 风险值班分析
     src = '';
   }else if(type == 11){ // 穿戴设备监测设备指标分析