Commit c86ed933 authored by liuna's avatar liuna

2017年11月28 智能分析平台提交内容

--质量规则维护
parent 292c0962
...@@ -7,32 +7,8 @@ ...@@ -7,32 +7,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2017年11月28 智能分析平台提交内容&#10; --质量规则维护"> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2017年11月28 智能分析平台提交内容&#10; --质量规则维护">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ProvinceDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ProvinceDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Kpi.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Kpi.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.iml" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ProvinceDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ProvinceDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/dygraph-combined2.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/dygraph-combined2.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -51,7 +27,7 @@ ...@@ -51,7 +27,7 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114"> <state relative-caret-position="114">
<caret line="104" column="18" lean-forward="true" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" /> <caret line="104" column="18" lean-forward="false" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" />
<folding> <folding>
<element signature="e#3935#3946#0" expanded="true" /> <element signature="e#3935#3946#0" expanded="true" />
<element signature="e#5186#5192#0" expanded="true" /> <element signature="e#5186#5192#0" expanded="true" />
...@@ -75,7 +51,7 @@ ...@@ -75,7 +51,7 @@
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257"> <state relative-caret-position="257">
<caret line="115" column="100" lean-forward="true" selection-start-line="115" selection-start-column="100" selection-end-line="115" selection-end-column="114" /> <caret line="115" column="100" lean-forward="false" selection-start-line="115" selection-start-column="100" selection-end-line="115" selection-end-column="114" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -95,7 +71,7 @@ ...@@ -95,7 +71,7 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320"> <state relative-caret-position="320">
<caret line="144" column="45" lean-forward="true" selection-start-line="144" selection-start-column="45" selection-end-line="144" selection-end-column="45" /> <caret line="144" column="45" lean-forward="false" selection-start-line="144" selection-start-column="45" selection-end-line="144" selection-end-column="45" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -552,7 +528,7 @@ ...@@ -552,7 +528,7 @@
<workItem from="1511142387727" duration="53000" /> <workItem from="1511142387727" duration="53000" />
<workItem from="1511516699030" duration="1573000" /> <workItem from="1511516699030" duration="1573000" />
<workItem from="1511519269600" duration="35315000" /> <workItem from="1511519269600" duration="35315000" />
<workItem from="1511745927420" duration="54167000" /> <workItem from="1511745927420" duration="54424000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit"> <task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created> <created>1507828551888</created>
...@@ -624,11 +600,18 @@ ...@@ -624,11 +600,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1510162965813</updated> <updated>1510162965813</updated>
</task> </task>
<option name="localTasksCounter" value="11" /> <task id="LOCAL-00011" summary="2017年11月28 智能分析平台提交内容&#10; --质量规则维护">
<created>1511851529061</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1511851529061</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="304928000" /> <option name="totallyTimeSpent" value="305185000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -659,8 +642,8 @@ ...@@ -659,8 +642,8 @@
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35081968" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35081968" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5344262" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5344262" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24508321" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24508321" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -1177,7 +1160,7 @@ ...@@ -1177,7 +1160,7 @@
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257"> <state relative-caret-position="257">
<caret line="115" column="100" lean-forward="true" selection-start-line="115" selection-start-column="100" selection-end-line="115" selection-end-column="114" /> <caret line="115" column="100" lean-forward="false" selection-start-line="115" selection-start-column="100" selection-end-line="115" selection-end-column="114" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1185,7 +1168,7 @@ ...@@ -1185,7 +1168,7 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320"> <state relative-caret-position="320">
<caret line="144" column="45" lean-forward="true" selection-start-line="144" selection-start-column="45" selection-end-line="144" selection-end-column="45" /> <caret line="144" column="45" lean-forward="false" selection-start-line="144" selection-start-column="45" selection-end-line="144" selection-end-column="45" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1201,7 +1184,7 @@ ...@@ -1201,7 +1184,7 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114"> <state relative-caret-position="114">
<caret line="104" column="18" lean-forward="true" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" /> <caret line="104" column="18" lean-forward="false" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" />
<folding> <folding>
<element signature="e#3935#3946#0" expanded="true" /> <element signature="e#3935#3946#0" expanded="true" />
<element signature="e#5186#5192#0" expanded="true" /> <element signature="e#5186#5192#0" expanded="true" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment