Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5d2c836fbc
|
|
@ -1,12 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="WEB_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<content url="file://$MODULE_DIR$">
|
<exclude-output />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
<content url="file://$MODULE_DIR$" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ function changeData(that, type) {
|
||||||
}else if(type == 8){ // 项目管理分析
|
}else if(type == 8){ // 项目管理分析
|
||||||
src = '';
|
src = '';
|
||||||
}else if(type == 9){ // 整体效能分析
|
}else if(type == 9){ // 整体效能分析
|
||||||
src = '';
|
src = 'overallEfficiency.html';
|
||||||
}else if(type == 10){ // 风险值班分析
|
}else if(type == 10){ // 风险值班分析
|
||||||
src = '';
|
src = '';
|
||||||
}else if(type == 11){ // 穿戴设备监测设备指标分析
|
}else if(type == 11){ // 穿戴设备监测设备指标分析
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue