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

--质量规则维护

2017年11月28 智能分析平台提交内容
292c0962 · liuna · 009b18e1 · 292c0962 · 292c0962 · 292c0962
Commit 292c0962 authored Nov 28, 2017 by liuna
26 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,17 +6,33 @@
    </artifacts-to-build>
  </component>
  <component name="ChangeListManager">
-    <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
+    <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2017年11月28 智能分析平台提交内容&#10;      --质量规则维护">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
+      <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/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$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
+      <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/web/monitoroperation/WorkingOrderCreateController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
+      <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/webapp/WEB-INF/tags/XCD_RelStatus.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
+      <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/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" />
+      <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/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
+      <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/webapp/static/js/insideXcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" />
+      <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/webapp/static/js/xcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
+      <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>
    <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,7 +46,72 @@
    <option name="refreshEnabled" value="true" />
  </component>
  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <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" />
+              <folding>
+                <element signature="e#3935#3946#0" expanded="true" />
+                <element signature="e#5186#5192#0" expanded="true" />
+                <element signature="e#5813#5819#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="WorkingOrderCreateController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4972">
+              <caret line="67" column="13" lean-forward="false" selection-start-line="67" selection-start-column="13" selection-end-line="67" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="QualityRuleMaintain.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <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" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="QualityRuleResultController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1880">
+              <caret line="209" column="46" lean-forward="false" selection-start-line="209" selection-start-column="46" selection-end-line="209" selection-end-column="46" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ModelMaintainController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <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" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="QualityRuleResult.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3794">
+              <caret line="207" column="0" lean-forward="false" selection-start-line="207" selection-start-column="0" selection-end-line="207" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
@@ -43,19 +124,6 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>k==7</find>
-      <find>create</find>
-      <find>xcdWarningInfoViewService</find>
-      <find>glyphicon-class</find>
-      <find>style</find>
-      <find>exportWord</find>
-      <find>createForm</find>
-      <find>upload</find>
-      <find>window.open</find>
-      <find>header[7]</find>
-      <find>console.log</find>
-      <find>==</find>
-      <find>viewAction</find>
      <find>pentaho/view</find>
      <find>biserver_config</find>
      <find>initDate</find>
@@ -73,6 +141,19 @@
      <find>getUrlParams</find>
      <find>green-tr</find>
      <find>update</find>
+      <find>statsDatasourceChange</find>
+      <find>datasourceStats</find>
+      <find>businessItem</find>
+      <find>businesstd</find>
+      <find>WdatePicker</find>
+      <find>ruleCrtTime</find>
+      <find>getObjectName</find>
+      <find>objectlist</find>
+      <find>modelResultTable</find>
+      <find>paramTbody</find>
+      <find>getFullYear()</find>
+      <find>dataModelId</find>
+      <find>ruleMaintainForm</find>
    </findStrings>
    <replaceStrings>
      <replace>InsideXcdWorkingOrderInfoView</replace>
@@ -82,7 +163,7 @@
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
-        <entry key="$PROJECT_DIR$" value="19d07868b735519aaa9e55a8492efeafefbefb3f" />
+        <entry key="$PROJECT_DIR$" value="master" />
      </map>
    </option>
    <option name="RESET_MODE" value="MIXED" />
@@ -95,17 +176,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar!/com/google/gson/Gson.class" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Model_DataType" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysis.jsp" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWorkingOrderInfo.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcd.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcdTable.jsp" />
@@ -140,6 +210,23 @@
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
        <option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/My97DatePicker/WdatePicker.js" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/js/dygraph-combined2.js" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ProvinceDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
      </list>
    </option>
  </component>
@@ -191,26 +278,32 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
-      <pane id="AndroidView" />
-      <pane id="Scope" />
-      <pane id="Scratches" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
-              <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
-              <item name="trunk" type="462c0819:PsiDirectoryNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
-              <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
-              <item name="trunk" type="462c0819:PsiDirectoryNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
-              <item name="数据库脚本" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
      <pane id="PackagesPane" />
+      <pane id="Scratches" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -219,10 +312,10 @@
    <property name="project.structure.last.edited" value="Artifacts" />
    <property name="project.structure.proportion" value="0.15" />
    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../大屏前台/http" />
+    <property name="last_opened_file_path" value="D:/CMSZMonitorAnalysis/apache-tomcat-7.0.47/lib/servlet-api.jar!/" />
    <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
    <property name="ignore_missing_gitignore" value="true" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
+    <property name="SearchEverywhereHistoryKey" value="Timestamp&#9;null&#9;null&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
    <property name="jsx.switch.disabled" value="true" />
  </component>
  <component name="RecentsManager">
@@ -457,6 +550,9 @@
      <workItem from="1510044948539" duration="32189000" />
      <workItem from="1510981253246" duration="11664000" />
      <workItem from="1511142387727" duration="53000" />
+      <workItem from="1511516699030" duration="1573000" />
+      <workItem from="1511519269600" duration="35315000" />
+      <workItem from="1511745927420" duration="54167000" />
    </task>
    <task id="LOCAL-00001" summary="first commit">
      <created>1507828551888</created>
@@ -532,45 +628,54 @@
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="213873000" />
+    <option name="totallyTimeSpent" value="304928000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
  </component>
  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
    <layout>
      <window_info id="Palette" 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="4" side_tool="false" content_ui="tabs" />
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
      <window_info id="Application Servers" 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="15" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" 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="16" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IvyIDEA" 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="10" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
      <window_info id="Designer" 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="7" side_tool="false" content_ui="tabs" />
      <window_info id="Database" 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="6" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="UI Designer" 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="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39901477" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34754097" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2967213" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Palette&#9;" 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="8" 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.32840723" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972973" sideWeight="0.49545455" order="12" 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.7582237" 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="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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2377892" 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" />
      <window_info id="Bean Validation" 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="12" side_tool="false" content_ui="tabs" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Theme Preview" 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="14" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" />
      <window_info id="SVN Repositories" 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="7" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="IvyIDEA" 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="10" side_tool="false" content_ui="tabs" />
      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3223684" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -626,7 +731,8 @@
    <MESSAGE value="2017年11月08 智能分析平台提交内容&#10;    --模型页面" />
    <MESSAGE value="2017年11月09 智能分析平台提交内容&#10;      --模型管理增加字段&#10;      --告警监控-内部协查单功能&#10;      --验收通过" />
    <MESSAGE value="2017年11月09 智能分析平台提交内容&#10;      --数据库脚本更新" />
-    <option name="LAST_COMMIT_MESSAGE" value="2017年11月09 智能分析平台提交内容&#10;      --数据库脚本更新" />
+    <MESSAGE value="2017年11月28 智能分析平台提交内容&#10;      --质量规则维护" />
+    <option name="LAST_COMMIT_MESSAGE" value="2017年11月28 智能分析平台提交内容&#10;      --质量规则维护" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -638,7 +744,7 @@
          <option name="timeStamp" value="17" />
        </line-breakpoint>
      </breakpoints>
-      <option name="time" value="28" />
+      <option name="time" value="41" />
    </breakpoint-manager>
    <watches-manager />
  </component>
@@ -655,362 +761,452 @@
    </buildFile>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_modelResult_DataModelTypeTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisLifeCycleController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
+        <state relative-caret-position="352">
-          <caret line="90" column="13" lean-forward="false" selection-start-line="90" selection-start-column="13" selection-end-line="90" selection-end-column="13" />
+          <caret line="68" column="13" lean-forward="false" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxDetailController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
+        <state relative-caret-position="-3965">
-          <caret line="78" column="12" lean-forward="true" selection-start-line="78" selection-start-column="12" selection-end-line="78" selection-end-column="12" />
+          <caret line="70" column="13" lean-forward="false" selection-start-line="70" selection-start-column="13" selection-end-line="70" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/JCS_datasource_channle.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskDetailManageController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="-29">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
+        <state relative-caret-position="169">
-          <caret line="9" column="51" lean-forward="false" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
+          <caret line="66" column="123" lean-forward="false" selection-start-line="66" selection-start-column="123" selection-end-line="66" selection-end-column="123" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/IndexController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
+        <state relative-caret-position="767">
-          <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+          <caret line="654" column="0" lean-forward="false" selection-start-line="654" selection-start-column="0" selection-end-line="654" selection-end-column="0" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="-3919">
-          <caret line="13" column="71" lean-forward="true" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="71" />
+          <caret line="52" column="13" lean-forward="false" selection-start-line="52" selection-start-column="13" selection-end-line="52" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/PagingAndSortingRepository.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="80">
-          <caret line="10" column="44" lean-forward="false" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
+          <caret line="38" column="36" lean-forward="false" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/dygraph-extra.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
+        <state relative-caret-position="-3102">
-          <caret line="16" column="36" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="36" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="n#!!doc" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysis.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="2728">
-          <caret line="50" column="41" lean-forward="true" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
+          <caret line="211" column="62" lean-forward="true" selection-start-line="211" selection-start-column="62" selection-end-line="211" selection-end-column="62" />
+          <folding>
+            <marker date="1511516640330" expanded="true" signature="12232:12257" ph="..." />
+            <marker date="1511516640330" expanded="true" signature="40404:40452" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/warnAnalysisDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
+        <state relative-caret-position="-2178">
-          <caret line="92" column="97" lean-forward="false" selection-start-line="92" selection-start-column="86" selection-end-line="92" selection-end-column="97" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <marker date="1511516671182" expanded="true" signature="14997:15011" ph="..." />
+            <marker date="1511516671182" expanded="true" signature="16193:16203" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-66">
+        <state relative-caret-position="-1112">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="86" column="13" lean-forward="false" selection-start-line="86" selection-start-column="13" selection-end-line="86" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/KpiService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
+        <state relative-caret-position="-2131">
-          <caret line="41" column="47" lean-forward="false" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="47" />
+          <caret line="28" column="13" lean-forward="false" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
+        <state relative-caret-position="-4158">
-          <caret line="76" column="16" lean-forward="false" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/ExportWordUtil.java">
+    <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/core-scripting.rnc">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
+        <state relative-caret-position="157">
-          <caret line="190" column="29" lean-forward="false" selection-start-line="190" selection-start-column="29" selection-end-line="190" selection-end-column="29" />
+          <caret line="208" column="38" lean-forward="false" selection-start-line="208" selection-start-column="38" selection-end-line="208" selection-end-column="38" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
+        <state relative-caret-position="201">
-          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <caret line="36" column="151" lean-forward="false" selection-start-line="36" selection-start-column="151" selection-end-line="36" selection-end-column="151" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
+        <state relative-caret-position="84">
-          <caret line="322" column="60" lean-forward="true" selection-start-line="322" selection-start-column="60" selection-end-line="322" selection-end-column="60" />
+          <caret line="31" column="94" lean-forward="false" selection-start-line="31" selection-start-column="94" selection-end-line="31" selection-end-column="94" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/default.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-182">
+        <state relative-caret-position="-57">
-          <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+          <caret line="69" column="39" lean-forward="false" selection-start-line="69" selection-start-column="39" selection-end-line="69" selection-end-column="39" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="478">
+        <state relative-caret-position="48">
-          <caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+          <caret line="636" column="60" lean-forward="false" selection-start-line="636" selection-start-column="60" selection-end-line="636" selection-end-column="60" />
+          <folding>
+            <marker date="1511516640337" expanded="true" signature="47293:47349" ph="..." />
+            <marker date="1511516640337" expanded="true" signature="47572:47583" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxDetailInfo.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
+        <state relative-caret-position="-1682">
-          <caret line="100" column="17" lean-forward="false" selection-start-line="100" selection-start-column="9" selection-end-line="100" selection-end-column="17" />
+          <caret line="22" column="15" lean-forward="true" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="32" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
+        <state relative-caret-position="29">
-          <caret line="33" column="32" lean-forward="true" selection-start-line="33" selection-start-column="32" selection-end-line="33" selection-end-column="32" />
+          <caret line="35" column="33" lean-forward="false" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ProvinceDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
+        <state relative-caret-position="229">
-          <caret line="45" column="18" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="18" />
+          <caret line="25" column="51" lean-forward="false" selection-start-line="25" selection-start-column="51" selection-end-line="25" selection-end-column="51" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
+        <state relative-caret-position="-2530">
-          <caret line="19" column="47" lean-forward="false" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
+          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/ChannelService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
+        <state relative-caret-position="215">
-          <caret line="83" column="145" lean-forward="false" selection-start-line="83" selection-start-column="143" selection-end-line="83" selection-end-column="145" />
+          <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/数据库脚本/201710/view.sql">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureForcastController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
+        <state relative-caret-position="-268">
-          <caret line="5" column="36" lean-forward="true" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
+          <caret line="451" column="45" lean-forward="false" selection-start-line="451" selection-start-column="45" selection-end-line="451" selection-end-column="45" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderDetailController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ChannelDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1720">
+        <state relative-caret-position="-49">
-          <caret line="64" column="13" lean-forward="false" selection-start-line="64" selection-start-column="13" selection-end-line="64" selection-end-column="13" />
+          <caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
+        <state relative-caret-position="243">
-          <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="39" />
+          <caret line="29" column="31" lean-forward="false" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
+        <state relative-caret-position="154">
-          <caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
+          <caret line="559" column="142" lean-forward="true" selection-start-line="559" selection-start-column="142" selection-end-line="559" selection-end-column="142" />
+          <folding>
+            <marker date="1511836552949" expanded="true" signature="9994:10006" ph="..." />
+            <marker date="1511836552949" expanded="true" signature="14365:14375" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeOrder.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
+        <state relative-caret-position="-6517">
-          <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisDetailController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2112">
+        <state relative-caret-position="-2750">
-          <caret line="79" column="41" lean-forward="false" selection-start-line="79" selection-start-column="13" selection-end-line="79" selection-end-column="41" />
+          <caret line="31" column="16" lean-forward="true" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
+          <folding>
+            <marker date="1511516640336" expanded="true" signature="24226:24239" ph="..." />
+            <marker date="1511516640336" expanded="true" signature="26170:26183" ph="..." />
+            <marker date="1511516640336" expanded="true" signature="30315:30373" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="-4604">
-          <caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="34" />
+          <caret line="254" column="52" lean-forward="false" selection-start-line="254" selection-start-column="52" selection-end-line="254" selection-end-column="52" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
+        <state relative-caret-position="-2772">
-          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ProviderEWarningAnalysis.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
+        <state relative-caret-position="110">
-          <caret line="8" column="90" lean-forward="false" selection-start-line="8" selection-start-column="90" selection-end-line="8" selection-end-column="90" />
+          <caret line="53" column="54" lean-forward="true" selection-start-line="53" selection-start-column="54" selection-end-line="53" selection-end-column="54" />
+          <folding>
+            <marker date="1511516640239" expanded="true" signature="11407:11419" ph="..." />
+            <marker date="1511516640239" expanded="true" signature="16533:16550" ph="..." />
+            <marker date="1511516640239" expanded="true" signature="19595:19612" ph="..." />
+            <marker date="1511516640239" expanded="true" signature="22109:22126" ph="..." />
+            <marker date="1511516640239" expanded="true" signature="25203:25220" ph="..." />
+            <marker date="1511516640239" expanded="true" signature="29676:29724" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdChangeOrderService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/ProviderAnalysisController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-248">
+        <state relative-caret-position="-6069">
-          <caret line="23" column="34" lean-forward="false" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="34" />
+          <caret line="68" column="13" lean-forward="false" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/ProviderEWarningAnalysisController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
+        <state relative-caret-position="-490">
-          <caret line="49" column="33" lean-forward="true" selection-start-line="49" selection-start-column="33" selection-end-line="49" selection-end-column="33" />
+          <caret line="63" column="13" lean-forward="false" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/datamanage/KnowledgeCreateController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
+        <state relative-caret-position="-4312">
-          <caret line="323" column="87" lean-forward="false" selection-start-line="323" selection-start-column="69" selection-end-line="323" selection-end-column="87" />
+          <caret line="44" column="13" lean-forward="false" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/dygraph-combined2.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="412">
+        <state relative-caret-position="134">
-          <caret line="586" column="11" lean-forward="true" selection-start-line="586" selection-start-column="11" selection-end-line="586" selection-end-column="11" />
+          <caret line="420" column="40" lean-forward="false" selection-start-line="420" selection-start-column="40" selection-end-line="420" selection-end-column="40" />
+          <folding>
+            <marker date="1511760149533" expanded="true" signature="197398:197440" ph="..." />
+            <marker date="1511760149533" expanded="true" signature="198582:198605" ph="..." />
+            <marker date="1511760149533" expanded="true" signature="198633:198639" ph="&amp;nbsp;" />
+            <marker date="1511760149533" expanded="true" signature="198911:199035" ph="..." />
+            <marker date="1511760149533" expanded="true" signature="199893:200052" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureCreateController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
+        <state relative-caret-position="-8140">
-          <caret line="33" column="16" lean-forward="false" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
+          <caret line="63" column="13" lean-forward="false" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
+        <state relative-caret-position="69">
-          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
+          <caret line="36" column="34" lean-forward="true" selection-start-line="36" selection-start-column="34" selection-end-line="36" selection-end-column="34" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
+        <state relative-caret-position="22">
-          <caret line="9" column="114" lean-forward="false" selection-start-line="9" selection-start-column="85" selection-end-line="9" selection-end-column="114" />
+          <caret line="122" column="34" lean-forward="true" selection-start-line="122" selection-start-column="34" selection-end-line="122" selection-end-column="34" />
+          <folding>
+            <marker date="1511516671157" expanded="true" signature="11810:11822" ph="..." />
+            <marker date="1511516671157" expanded="true" signature="16324:16334" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/BusinessTag.tag">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1826">
+        <state relative-caret-position="-558">
-          <caret line="118" column="41" lean-forward="false" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="41" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="3630">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="263" column="18" lean-forward="true" selection-start-line="263" selection-start-column="18" selection-end-line="263" selection-end-column="18" />
+          <folding>
+            <marker date="1511516952446" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
+            <marker date="1511516952446" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningStatus.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="1461">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="102" column="66" lean-forward="false" selection-start-line="102" selection-start-column="66" selection-end-line="102" selection-end-column="66" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
+        <state relative-caret-position="259">
-          <caret line="334" column="62" lean-forward="true" selection-start-line="334" selection-start-column="62" selection-end-line="334" selection-end-column="62" />
+          <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxWarningInfo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModelView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
+        <state relative-caret-position="73">
-          <caret line="22" column="34" lean-forward="false" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="34" />
+          <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxWarningInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
+        <state relative-caret-position="69">
-          <caret line="31" column="60" lean-forward="false" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="60" />
+          <caret line="158" column="48" lean-forward="true" selection-start-line="158" selection-start-column="48" selection-end-line="158" selection-end-column="48" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
+        <state relative-caret-position="3794">
-          <caret line="22" column="20" lean-forward="true" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
+          <caret line="207" column="0" lean-forward="false" selection-start-line="207" selection-start-column="0" selection-end-line="207" selection-end-column="0" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
+        <state relative-caret-position="1880">
-          <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="4" />
+          <caret line="209" column="46" lean-forward="false" selection-start-line="209" selection-start-column="46" selection-end-line="209" selection-end-column="46" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8">
+        <state relative-caret-position="257">
-          <caret line="286" column="48" lean-forward="false" selection-start-line="286" selection-start-column="48" selection-end-line="286" selection-end-column="48" />
+          <caret line="115" column="100" lean-forward="true" selection-start-line="115" selection-start-column="100" selection-end-line="115" selection-end-column="114" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
+        <state relative-caret-position="320">
-          <caret line="685" column="51" lean-forward="false" selection-start-line="685" selection-start-column="51" selection-end-line="685" selection-end-column="51" />
+          <caret line="144" column="45" lean-forward="true" selection-start-line="144" selection-start-column="45" selection-end-line="144" selection-end-column="45" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/GjfxWarningInfoService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
+        <state relative-caret-position="-4972">
-          <caret line="28" column="39" lean-forward="false" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
+          <caret line="67" column="13" lean-forward="false" selection-start-line="67" selection-start-column="13" selection-end-line="67" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/css/styles.css">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
+        <state relative-caret-position="114">
-          <caret line="854" column="16" lean-forward="false" selection-start-line="854" selection-start-column="7" selection-end-line="854" selection-end-column="16" />
+          <caret line="104" column="18" lean-forward="true" 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#5186#5192#0" expanded="true" />
+            <element signature="e#5813#5819#0" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>
@@ -1021,9 +1217,9 @@
        <settings>
          <artifact-editor>
            <show-content>
+              <type id="library" />
              <type id="artifact" />
              <type id="javaee-facet-resources" />
-              <type id="library" />
              <type id="jpa-descriptors" />
            </show-content>
          </artifact-editor>
@@ -1040,7 +1236,7 @@
      </state>
      <state key="FacetStructureConfigurable.UI">
        <settings>
-          <last-edited>Web</last-edited>
+          <last-edited>Web (CmszMonitorAnalysis)|Web</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
@@ -1076,7 +1272,7 @@
      </state>
      <state key="ModuleStructureConfigurable.UI">
        <settings>
-          <last-edited>CmszMonitorAnalysis</last-edited>
+          <last-edited>Web|CmszMonitorAnalysis</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>

--- a/CmszMonitorAnalysis.iml
+++ b/CmszMonitorAnalysis.iml
@@ -1470,7 +1470,14 @@
        <SOURCES />
      </library>
    </orderEntry>
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module-library">
-    <orderEntry type="library" name="servlet-api" level="application" />
+      <library>
+        <CLASSES>
+          <root url="jar://D:/CMSZMonitorAnalysis/apache-tomcat-7.0.47/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
  </component>
 </module>
\ No newline at end of file
--- a/src/main/java/com/hp/cmsz/entity/AccuracyRule.java
+++ b/src/main/java/com/hp/cmsz/entity/AccuracyRule.java
@@ -24,8 +24,8 @@ public class AccuracyRule implements Serializable {
 	private Long accuracyRuleId;//准确性规则ID
 	private Long qualityRuleId;//质量规则ID
 	private String ruleType;//规则类型
-	private double scopeMaxValue;//范围最大值
+	private String scopeMaxValue;//范围最大值
-	private double scopeMinValue;//范围最小值
+	private String scopeMinValue;//范围最小值
 	private String repeatedCheckGranularity;//重复考核粒度
 	private Date repeatedCheckStartTime;//重复考核开始时间
 	private Date repeatedCheckEndTime;//重复考核结束时间
@@ -58,16 +58,16 @@ public class AccuracyRule implements Serializable {
 	public void setRuleType(String ruleType) {
 		this.ruleType = ruleType;
 	}
-	public double getScopeMaxValue() {
+	public String getScopeMaxValue() {
 		return scopeMaxValue;
 	}
-	public void setScopeMaxValue(double scopeMaxValue) {
+	public void setScopeMaxValue(String scopeMaxValue) {
 		this.scopeMaxValue = scopeMaxValue;
 	}
-	public double getScopeMinValue() {
+	public String getScopeMinValue() {
 		return scopeMinValue;
 	}
-	public void setScopeMinValue(double scopeMinValue) {
+	public void setScopeMinValue(String scopeMinValue) {
 		this.scopeMinValue = scopeMinValue;
 	}
 	public String getRepeatedCheckGranularity() {

--- a/src/main/java/com/hp/cmsz/entity/DimKpi.java
+++ b/src/main/java/com/hp/cmsz/entity/DimKpi.java
@@ -18,7 +18,7 @@ import javax.persistence.Table;
 */
 @Entity
-@Table(name = "etl.dim_kpi_t")
+@Table(name = "dim_kpi_t",schema = "etl")
 public class DimKpi implements Serializable{
 	/**

--- a/src/main/java/com/hp/cmsz/entity/Kpi.java
+++ b/src/main/java/com/hp/cmsz/entity/Kpi.java
@@ -41,6 +41,7 @@ public class Kpi implements Serializable{
 	private Long kpiTypeId;
 	private Long kpiCycleTypeId;
 	private String isActive ;  //是否有效，为Y时，才需要在筛选项中显示
+	private String calCycle;
 	public Long getKpiId() {
 		return kpiId;
@@ -111,4 +112,7 @@ public class Kpi implements Serializable{
 	public void setIsActive(String isActive) {
 		this.isActive = isActive;
 	}
+	public String getCalCycle(){ return calCycle;}
+	public void setCalCycle(String calCycle) { this.calCycle = calCycle;}
 }
--- a/src/main/java/com/hp/cmsz/entity/QualityRule.java
+++ b/src/main/java/com/hp/cmsz/entity/QualityRule.java
@@ -37,7 +37,7 @@ public class QualityRule  {
 	@Id
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="QualityRuleSequence")
-    @SequenceGenerator(name = "QualityRuleSequence", sequenceName = "ccolap.quality_rule_deq", allocationSize=1)
+    @SequenceGenerator(name = "QualityRuleSequence", sequenceName = "ccolap.quality_rule_seq", allocationSize=1)
 	public Long getQualityRuleId() {
 		return qualityRuleId;
 	}

--- a/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java
+++ b/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java
@@ -34,7 +34,7 @@ public interface AccuracyRuleDao extends JpaSpecificationExecutor<AccuracyRule>,
 	//根据准确性规则ID更新准确性规则信息
 	@Modifying
 	@Query("update AccuracyRule ar set ar.ruleType=:ruleType, ar.scopeMaxValue=:scopeMaxValue, ar.scopeMinValue=:scopeMinValue, ar.repeatedCheckGranularity=:repeatedCheckGranularity, ar.repeatedCheckStartTime=:repeatedCheckStartTime, ar.repeatedCheckEndTime=:repeatedCheckEndTime, ar.ifRepeatedCheckSeries=:ifRepeatedCheckSeries, ar.repeatedCheckMaxTime=:repeatedCheckMaxTime, ar.ifRepeatedCheckSummation=:ifRepeatedCheckSummation where ar.accuracyRuleId =:accuracyRuleId")
-	void updateAccuracyRuleByAccuracyRuleId(@Param("ruleType")String ruleType,@Param("scopeMaxValue")double scopeMaxValue,@Param("scopeMinValue")double scopeMinValue,@Param("repeatedCheckGranularity")String repeatedCheckGranularity,@Param("repeatedCheckStartTime")Date repeatedCheckStartTime,@Param("repeatedCheckEndTime")Date repeatedCheckEndTime,@Param("ifRepeatedCheckSeries")String ifRepeatedCheckSeries,@Param("repeatedCheckMaxTime")Long repeatedCheckMaxTime,@Param("ifRepeatedCheckSummation")String ifRepeatedCheckSummation,@Param("accuracyRuleId")Long accuracyRuleId);
+	void updateAccuracyRuleByAccuracyRuleId(@Param("ruleType")String ruleType,@Param("scopeMaxValue")String scopeMaxValue,@Param("scopeMinValue")String scopeMinValue,@Param("repeatedCheckGranularity")String repeatedCheckGranularity,@Param("repeatedCheckStartTime")Date repeatedCheckStartTime,@Param("repeatedCheckEndTime")Date repeatedCheckEndTime,@Param("ifRepeatedCheckSeries")String ifRepeatedCheckSeries,@Param("repeatedCheckMaxTime")Long repeatedCheckMaxTime,@Param("ifRepeatedCheckSummation")String ifRepeatedCheckSummation,@Param("accuracyRuleId")Long accuracyRuleId);
 	//根据准确性规则ID删除一条准确性规则信息
 	@Modifying

--- a/src/main/java/com/hp/cmsz/repository/KpiDao.java
+++ b/src/main/java/com/hp/cmsz/repository/KpiDao.java
@@ -26,9 +26,14 @@ public interface KpiDao extends JpaSpecificationExecutor<Kpi>,PagingAndSortingRe
       List<Kpi> findByBusinessIdIn(List<Long> businessIdList);
       List<Kpi> findByBusinessIdIn(Collection<Long> businessIdList);
+       @Query("select  kpi.kpiName, kpi.kpiCode from Kpi kpi where kpi.kpiId = :kpiId")
+	   List<Kpi> findKpiCodeAndKpiNameByKpiId(@Param("kpiId") Long kpiId);
       @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi  where kpi.kpiId >=0")
       List<Object[]> findAllKpiIdAndKpiName();
     //由指标名得到指标周期类型
       @Query("select kpiCycleType.isHourKpi from Kpi kpi,KpiCycleType kpiCycleType where kpi.kpiCycleTypeId=kpiCycleType.kpiCycleTypeId and kpi.kpiName IN (:kpiName) and kpi.kpiId >=0")
       List<Object[]> findKpiCycleTypeByKpiName(@Param("kpiName") String kpiName);
@@ -38,9 +43,9 @@ public interface KpiDao extends JpaSpecificationExecutor<Kpi>,PagingAndSortingRe
       @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId IN (:businessIdList) and kpi.kpiId >=0")
       List<Object[]> findAllKpiIdAndKpiNameByBusinessId(@Param("businessIdList") List<Long> businessIdList);
-       //由业务联动得到指标
+       //由业务,采集频率联动得到指标
-       @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where business.businessId = kpi.businessId and kpi.isActive = 'Y' and business.businessId in (:businessIds) and kpi.kpiId>=0 order by kpi.kpiId ")
+       @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where business.businessId = kpi.businessId and kpi.isActive = 'Y' and kpi.calCycle=:calCycleValue and business.businessId in (:businessIds) and kpi.kpiId>=0 order by kpi.kpiId ")
-       List<Object[]> findKpiIdAndKpiNameByBusinessIds(@Param("businessIds")List<Long> businessIdList);
+       List<Object[]> findKpiIdAndKpiNameByBusinessIds(@Param("businessIds")List<Long> businessIdList, @Param("calCycleValue") String calCycleValue);
       //由单个业务ID得到指标
       @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId = :businessIdList and kpi.kpiId >=0")

--- a/src/main/java/com/hp/cmsz/repository/ProvinceDao.java
+++ b/src/main/java/com/hp/cmsz/repository/ProvinceDao.java
@@ -4,6 +4,7 @@ package com.hp.cmsz.repository;
 import java.util.Date;
 import java.util.List;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
@@ -22,6 +23,7 @@ public interface ProvinceDao extends JpaSpecificationExecutor<Province>,
 	List<Province> findByProvinceIdIn(List<Long> provinceIds);
+	List<Province> findByProvinceId(Long provinceId);
 	@Query("from Province p where p.provinceId>=0  order by p.provinceId")
 	List<Province> findProvince();

--- a/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java
+++ b/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java
@@ -29,7 +29,7 @@ public class AccuracyRuleService {
 	//根据准确性规则ID更新准确性规则
 	@Transactional(readOnly=false)
-	public void updateAccuracyRuleByAccuracyRuleId(String ruleType,double scopeMaxValue,double scopeMinValue,String repeatedCheckGranularity,Date repeatedCheckStartTime,Date repeatedCheckEndTime,String ifRepeatedCheckSeries,Long repeatedCheckMaxTime,String ifRepeatedCheckSummation,Long accuracyRuleId){
+	public void updateAccuracyRuleByAccuracyRuleId(String ruleType,String scopeMaxValue,String scopeMinValue,String repeatedCheckGranularity,Date repeatedCheckStartTime,Date repeatedCheckEndTime,String ifRepeatedCheckSeries,Long repeatedCheckMaxTime,String ifRepeatedCheckSummation,Long accuracyRuleId){
 		accuracyRuleDao.updateAccuracyRuleByAccuracyRuleId(ruleType, scopeMaxValue, scopeMinValue, repeatedCheckGranularity, repeatedCheckStartTime, repeatedCheckEndTime, ifRepeatedCheckSeries, repeatedCheckMaxTime, ifRepeatedCheckSummation,accuracyRuleId);
 	}

--- a/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
+++ b/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
@@ -2,6 +2,7 @@ package com.hp.cmsz.web.analysissupport;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -24,13 +25,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.google.gson.Gson;
 import com.hp.cmsz.entity.Business;
 import com.hp.cmsz.entity.Channel;
-import com.hp.cmsz.entity.ChannelDataSourceMap;
-import com.hp.cmsz.entity.DataModel;
 import com.hp.cmsz.entity.DataSource;
 import com.hp.cmsz.entity.DataType;
+import com.hp.cmsz.entity.QualityRule;
 import com.hp.cmsz.entity.Kpi;
-import com.hp.cmsz.entity.ModelParameter;
 import com.hp.cmsz.entity.Province;
+import com.hp.cmsz.entity.AccuracyRule;
 import com.hp.cmsz.repository.AccuracyRuleDao;
 import com.hp.cmsz.repository.BusinessDao;
 import com.hp.cmsz.repository.ChannelDao;
@@ -81,17 +81,17 @@ public class QualityRuleMaintainController {
 	@Autowired
 	private DataSourceDao dataSourceDao;
-//	@Autowired
+	@Autowired
-//	private QualityRuleDao qualityRuleDao;
+	private QualityRuleDao qualityRuleDao;
-//	
-//	@Autowired
+	@Autowired
-//	private QualityRuleService qualityRuleService;
+	private QualityRuleService qualityRuleService;
-//	
-//	@Autowired
+	@Autowired
-//	private AccuracyRuleDao accuracyRuleDao;
+	private AccuracyRuleDao accuracyRuleDao;
-//	
-//	@Autowired
+	@Autowired
-//	private CmszOperationLogService cmszOperationLogService;
+	private CmszOperationLogService cmszOperationLogService;
 	@RequestMapping(value = "")
    public String ruleMaintainHome(Map model){
@@ -142,7 +142,6 @@ public class QualityRuleMaintainController {
 		    			 }
 		    		 }
 		    	 }
 		    	 resultList.add(objs);
 			}
@@ -162,34 +161,17 @@ public class QualityRuleMaintainController {
 	}
-//	@RequestMapping(value="/findBusinessId*")
-//	@ResponseBody
-//	public  void  findBusinessId(@RequestParam(value = "dataSource", defaultValue ="" )  String dataSource,
-//			@RequestParam(value = "channelId", defaultValue ="" ) String channelId,
-//			 HttpServletResponse response){
-//		 List<Object[]> channelDataSourceMapIdList = (List<Object[]>)businessDao.findBusinessIdAndBusinessNameByDataSourceIdAndChannelIdWithIsActive(Long.parseLong(dataSource),Long.parseLong(channel));
-//		Gson gson = new Gson();
-//		response.setContentType("text/Xml;charset=gbk");
-//	       PrintWriter out = null;
-//	       try {
-//	            out = response.getWriter();
-//	            out.println(gson.toJson(dataSceAndBus));
-//	        }
-//	        catch (IOException ex1) {
-//	            ex1.printStackTrace();
-//	        }finally{    out.close();     }
-//	}
 	@RequestMapping(value="/findKpiId*")
 	@ResponseBody
 	public  void  findKpiId(@RequestParam(value = "businessIds", defaultValue ="" ) String businessIds,
+			 				@RequestParam(value = "calCycleValue", defaultValue = "30MI") String calCycleValue,
 			 				HttpServletResponse response){
 		String[] strs = businessIds.split(",");
 		List<Long> businessIdlist = new ArrayList<Long>();
-		for(int i=0;i<strs.length;i++){
+		for(int i=0;i<strs.length;i++) {
 			businessIdlist.add(Long.valueOf(strs[i]));
+		}
-		List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameByBusinessIds(businessIdlist);
+		List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameByBusinessIds(businessIdlist,calCycleValue);
 		 Gson gson = new Gson();
 		 response.setContentType("text/Xml;charset=gbk");
@@ -204,81 +186,116 @@ public class QualityRuleMaintainController {
 		}
-//	private List<Long> qualityRuleIdList = new ArrayList<Long>();
+	private List<Long> qualityRuleIdList = new ArrayList<Long>();
-//	//新增准确性规则
+	//新增准确性规则
-//	@RequestMapping(value = "/createAccuracyRule*", method = RequestMethod.GET)
+	@RequestMapping(value = "/createAccuracyRule*", method = RequestMethod.GET)
-//	@ResponseBody
+	@ResponseBody
-//	public void createAccuracyRule(
+	public void createAccuracyRule(
-//			@RequestParam(value="ruleType") String ruleType,			
+			@RequestParam(value="ruleType") String ruleType,
-//			@RequestParam(value="scopeMaxValue") String scopeMaxValue,
+			@RequestParam(value="scopeMaxValue") String scopeMaxValue,
-//			@RequestParam(value="scopeMinValue") String scopeMinValue,
+			@RequestParam(value="scopeMinValue") String scopeMinValue,
-//			@RequestParam(value="repeatedCheckGranularity") String repeatedCheckGranularity,
+			@RequestParam(value="repeatedCheckGranularity") String repeatedCheckGranularity,
-//			@RequestParam(value="repeatedCheckStartTime") String repeatedCheckStartTime,
+			@RequestParam(value="repeatedCheckStartTime") String repeatedCheckStartTime,
-//			@RequestParam(value="repeatedCheckEndTime") String repeatedCheckEndTime,
+			@RequestParam(value="repeatedCheckEndTime") String repeatedCheckEndTime,
-//			@RequestParam(value="ifRepeatedCheckSeries") String ifRepeatedCheckSeries,
+			@RequestParam(value="ifRepeatedCheckSeries") String ifRepeatedCheckSeries,
-//			@RequestParam(value="repeatedCheckMaxTime") String repeatedCheckMaxTime,
+			@RequestParam(value="repeatedCheckMaxTime") String repeatedCheckMaxTime,
-//			@RequestParam(value="ifRepeatedCheckSummation") String ifRepeatedCheckSummation,
+			@RequestParam(value="ifRepeatedCheckSummation") String ifRepeatedCheckSummation,
-//			HttpServletResponse response,HttpServletRequest request) {		
+			HttpServletResponse response,HttpServletRequest request)  {
+		AccuracyRule accuracyRule = new AccuracyRule();
+		if(!ruleType.trim().equals("")) {
+			if (ruleType == "1") {
+				accuracyRule.setRuleType("范围");
+			} else if (ruleType == "2") {
+				accuracyRule.setRuleType("重复");
+			}
+		}
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if(!scopeMaxValue.trim().equals("")){accuracyRule.setScopeMaxValue(scopeMaxValue);}
+		if(!scopeMinValue.trim().equals("")){accuracyRule.setScopeMinValue(scopeMinValue);}
+		if(!repeatedCheckGranularity.trim().equals("")){accuracyRule.setRepeatedCheckGranularity(repeatedCheckGranularity);}
+		if(!repeatedCheckStartTime.trim().equals("")){
+			try {
+				accuracyRule.setRepeatedCheckStartTime(sd.parse(repeatedCheckStartTime));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
+		if(!repeatedCheckEndTime.trim().equals("")){
+			try {
+				accuracyRule.setRepeatedCheckEndTime(sd.parse(repeatedCheckEndTime));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
+		if(!ifRepeatedCheckSeries.trim().equals("")){accuracyRule.setIfRepeatedCheckSeries(ifRepeatedCheckSeries);}
+		if(!repeatedCheckMaxTime.trim().equals("")){accuracyRule.setRepeatedCheckMaxTime(Long.parseLong(repeatedCheckMaxTime));}
+		if(!ifRepeatedCheckSummation.trim().equals("")){accuracyRule.setIfRepeatedCheckSummation(ifRepeatedCheckSummation);}
+		accuracyRule.setRuleCrtTime(new Date());
+		accuracyRule.setRuleUpdateTime(new Date());
+		accuracyRuleDao.save(accuracyRule);
+		Long qualityRuleId = accuracyRule.getAccuracyRuleId();
+		qualityRuleIdList.add(qualityRuleId);
+	}
+	//新增质量模型
+	@RequestMapping(value = "/saveRuleDataForm", method = RequestMethod.POST)
+	public String saveRuleDataForm(
+			HttpServletResponse response,HttpServletRequest request) throws ParseException{
+		System.out.println("123456");
+//		String provinceId = request.getParameter("province");
+//		String businessId = request.getParameter("businessinput");
+//		String channelId =request.getParameter("channel");
+//		String dataSourceId =request.getParameter("dataSource");
+//		String kpiId = request.getParameter("kpiinput");
+//		String kpiMonitorTime="";
+//		String businessTime="";
+//		String ruleCrtTime="";
+//		String ruleUpdateTime="";
 //
-//		AccuracyRule accuracyRule = new accuracyRule();
+//		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//		if(!ruleType.trim().equals("")){
+//		QualityRule qualityRule = new QualityRule();
-//			if(ruleType == 1){
+//		List<Long> provinceIdList = new ArrayList<Long>();
-//				accuracyRule.setruleType("范围");
+//		for(int i=0;i<provinceValue.split(",").length;i++){
-//			}else if(ruleType == 2){
+//			provinceIdList.add(Long.parseLong(provinceValue.split(",")[i]));
-//				accuracyRule.setruleType("重复");
 //		}
+//		List<Long> businessIdList = new ArrayList<Long>();
+//		for(int i=0;i<businessValue.split(",").length;i++){
+//			businessIdList.add(Long.parseLong(businessValue.split(",")[i]));
 //		}
-//		if(!scopeMaxValue.trim().equals("")){accuracyRule.setscopeMaxValue(scopeMaxValue);}
+//		List<Long> kpiIdList = new ArrayList<Long>();
-//		if(!scopeMinValue.trim().equals("")){accuracyRule.setscopeMinValue(scopeMinValue);}
+//		for(int i=0;i<kpiValue.split(",").length;i++){
-//		if(!repeatedCheckGranularity.trim().equals("")){accuracyRule.setrepeatedCheckGranularity(repeatedCheckGranularity);}
+//			kpiIdList.add(Long.parseLong(kpiValue.split(",")[i]));
-//		if(!repeatedCheckStartTime.trim().equals("")){accuracyRule.setrepeatedCheckStartTime(repeatedCheckStartTime);}
-//		if(!repeatedCheckEndTime.trim().equals("")){accuracyRule.setrepeatedCheckEndTime(repeatedCheckEndTime);}
-//		if(!ifRepeatedCheckSeries.trim().equals("")){accuracyRule.setifRepeatedCheckSeries(ifRepeatedCheckSeries);}
-//		if(!repeatedCheckMaxTime.trim().equals("")){accuracyRule.setrepeatedCheckMaxTime(repeatedCheckMaxTime);}
-//		if(!ifRepeatedCheckSummation.trim().equals("")){accuracyRule.setifRepeatedCheckSummation(ifRepeatedCheckSummation);}
-//
-//		accuracyRuleDao.save(accuracyRule);
-//		
-//		Long accuracyRuleId = accuracyRule.getaccuracyRuleId();
-//		qualityRuleIdList.add(qualityRuleId);
 //		}
+//		System.out.println("provinceIdList:"+provinceIdList+"businessIdList:"+businessIdList+"kpiIdList:"+kpiIdList);
-//	//新增质量模型
+//		for(int j=0; j<provinceIdList.size(); j++) {
-//	@RequestMapping(value = "/saveRuleDataForm", method = RequestMethod.POST)
+//			for(int k=0; k<businessIdList.size(); k++){
-//	public String saveRuleDataForm(HttpServletResponse response,HttpServletRequest request) throws ParseException{
+//				for(int l=0; l<kpiIdList.size(); l++){
-//		Long qualityRuleId = "";
+//					provinceId = provinceIdList.get(j);
-//		Long businessId = "";
+//					businessId = businessIdList.get(k);
-//		Long kpiId = "";
+//					kpiId = kpiIdList.get(l);
-//		Long channelId = "";
+//					if(!provinceId.equals("")){qualityRule.setProvinceId(provinceId);}
-//		Long provinceId = "";
+//					if(!businessId.equals("")){qualityRule.setBusinessId(businessId);}
-//		Long dataSourceId = "";
+//					if(!kpiId.equals("")){qualityRule.setKpiId(kpiId);}
-//		String kpiMonitorTime = "";
+//					if(!channelId.trim().equals("")){qualityRule.setChannelId(Long.parseLong(channelId));}
-//		String kpiMonitorRunTime = "";
+//					if(!dataSourceId.trim().equals("")){qualityRule.setDataSourceId(Long.parseLong(dataSourceId));}
-//		String businessTime = "";
+//					if(!kpiMonitorTime.trim().equals("")){qualityRule.setKpiMonitorTime(kpiMonitorTime);}
-//		Date ruleCrtTime = "";
+//					qualityRule.setKpiMonitorRunTime(kpiMonitorTime+businessTime);
-//		Date ruleUpdateTime = "";
+//					if(!businessTime.trim().equals("")){qualityRule.setBusinessTime(businessTime);}
-//		String ruleValidFlag = "";
+//					qualityRule.setRuleCrtTime(sd.parse(ruleCrtTime));
-//		String ifSystemValue = "";
+//					qualityRule.setRuleUpdateTime(sd.parse(ruleUpdateTime));
+//					qualityRule.setRuleValidFlag("0");
-//		QualityRule qualityRule = new qualityRule();
+//					qualityRule.setIfSystemValue("0");
-//		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//		if(!qualityRuleId.trim().equals("")){qualityRule.setqualityRuleId(Long.parseLong(qualityRuleId));}
-//		if(!businessId.trim().equals("")){qualityRule.setbusinessId(Long.parseLong(businessId));}
-//		if(!kpiId.trim().equals("")){qualityRule.setkpiId(Long.parseLong(kpiId));}
-//		if(!channelId.trim().equals("")){qualityRule.setchannelId(Long.parseLong(channelId));}
-//		if(!provinceId.trim().equals("")){qualityRule.setprovinceId(Long.parseLong(provinceId));}
-//		if(!dataSourceId.trim().equals("")){qualityRule.setdataSourceId(Long.parseLong(dataSourceId));}
-//		if(!kpiMonitorTime.trim().equals("")){qualityRule.setkpiMonitorTime(kpiMonitorTime);}
-//		qualityRule.setkpiMonitorRunTime(kpiMonitorTime);
-//		if(!businessTime.trim().equals("")){qualityRule.setbusinessTime(businessTime);}
-//		qualityRule.setruleCrtTime(sd.parse(ruleCrtTime));
-//		qualityRule.setruleUpdateTime(sd.parse(ruleUpdateTime));
-//		qualityRule.setruleValidFlag(1);
-//		qualityRule.setifSystemValue(1);
 //					qualityRuleDao.save(qualityRule);
-//		cmszOperationLogService.createLog("增加","新建质量模型","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+	qualityRule.getQualityRuleId().toString());
-//		Long qualityRuleId = qualityRule.getqualityRuleId();
-//		return "redirect:AnalysisSupport/QualityRuleResult";
 //				}
+//			}
+//		}
+//
+//		cmszOperationLogService.createLog("增加","新建质量模型","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+	qualityRule.getQualityRuleId().toString());
+//		Long qualityRuleId = qualityRule.getQualityRuleId();
+		return "redirect:AnalysisSupport/QualityRuleResult";
 	}
 }
--- a/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java
+++ b/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java
@@ -95,15 +95,15 @@ public class QualityRuleResultController {
 		//查询出所有的数据来源信息
 		List<DataSource> datasourceList=(List<DataSource>)dataSourceDao.findDataSource();
 		//查询出所有的质量规则
-		List<QualityRule> qualityRuleList=(List<QualityRule>)qualityRuleDao.findAll();
+		List<QualityRule> qualityRuleViewList=(List<QualityRule>)qualityRuleDao.findAll();
 		Gson gson = new Gson();
-		model.put("provinceList", gson.toJson(provinceList));
+		model.put("provinceList", provinceList);
 		model.put("channelList", channelList);
 		model.put("kpiList", kpiList);
 		model.put("businessList",businessList);
 		model.put("datasourceList", datasourceList);
-		model.put("qualityRuleList", qualityRuleList);
+		model.put("qualityRuleViewList", gson.toJson(qualityRuleViewList));
 		model.put("rulePageNum", rulePageNum);
 		cmszOperationLogService.createLog("查询","质量规则","质量规则首页");

--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Kpi.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Kpi.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class
--- a/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
+++ b/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
@@ -53,29 +53,34 @@
 										</td>
 									</tr>
 									<tr><td>数据来源（<font color="red">必填</font>）：</td>
-										<td><select class="form-control" name="dataSource" id="dataSource" >
+										<td>
+											<select class="form-control" name="dataSource" id="dataSource" >
 											<c:forEach var="dataSource" items="${dataSourceList}">
-			    									<option value="${dataSource.dataSourceId}">${dataSource.dataSourceName}</option>
+												<c:if test="${dataSource.dataSourceId == '5'}">
+													<option value="${dataSource.dataSourceId}" selected>${dataSource.dataSourceName}</option>
+												</c:if >
+												<c:if test="${dataSource.dataSourceId != '5'}">
+													<option value="${dataSource.dataSourceId}" >${dataSource.dataSourceName}</option>
+												</c:if >
 											</c:forEach>
 										    </select></td>
 									</tr>
 									<tr><td>渠道（<font color="red">必填</font>）：</td>
 										<td><select class="form-control" name="channel" id="channel" >
 			    								<c:forEach var="channel" items="${channelList}">
+													<c:if test="${channel.channelId == '7'}">
+			    										<option value="${channel.channelId}" selected>${channel.channelName}</option>
+													</c:if>
+													<c:if test="${channel.channelId != '7'}">
 														<option value="${channel.channelId}">${channel.channelName}</option>
+													</c:if>
 			    								</c:forEach>
 										    </select></td>
 									</tr>
 									<tr><td>业务（<font color="red">必填</font>）：</td>
 										<td >
 											<div id="businesstd"></div>
-			    							<input type="hidden" id="business" name="business" value='${businessList}' />
-										</td>
-									</tr>
-									<tr><td>指标（<font color="red">必填</font>）：</td>
-										<td>
-											<div id="kpitd"></div>
-											<input type="hidden" id="kpi" name="kpi" value='${kpiList}' />
 										</td>
 									</tr>
 									<tr><td>数据采集频率（<font color="red">必填</font>）：</td>
@@ -84,7 +89,14 @@
 												<option value="01HR">1小时</option>
 												<option value="01DY">1天</option>
 												<option value="01MO">1月</option>
-			    							</select></td></tr>
+											</select>
+										</td></tr>
+									<tr><td>指标（<font color="red">必填</font>）：</td>
+										<td>
+											<div id="kpitd"></div>
+										</td>
+									</tr>
 									<tr><td>指标监控时间（<font color="red">必填</font>）：</td>
 										<td>
 										<input type="text" style="width:200px" name="kpiMonitorTime" id="kpiMonitorTime" style="display: inline;" />
@@ -95,9 +107,9 @@
 			    									<option value="3">月</option>
 			    							</select></td>
 									</tr>
-									<tr><td>指标业务时间（<font color="red">必填</font>）：</td>
+									<tr><td>指标采集时间（<font color="red">必填</font>）：</td>
-										<td>					
+										<td id="businessTimetd">
-										<input type="text" class="form-control" name="businessTime" id="businessTime" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'businessTime\')}'})" />
+											<input type='text' class='form-control' id='businessTime' name='businessTime' onfocus='WdatePicker({dateFmt:"yyyy-MM-dd HH:mm:00",readOnly:false,hmsMenuCfg : {H : [ 1, 6 ], m : [ 30, 2 ], s : [ 60, 0 ]}})'/>
 										</td>
 									</tr>
 									<tr><td>规则创建时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="ruleCrtTime" name="ruleCrtTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'ruleCrtTime\')}'})" /></td></tr>
@@ -121,6 +133,8 @@
 											</td></tr>
 	                            </table>
 								</form>
+								<input type="hidden" id="kpi" name="kpi" value='${kpiList}' />
+								<input type="hidden" id="business" name="business" value='${businessList}' />
 							</div>
 						</div>
 					</div>
@@ -151,7 +165,7 @@ $("#ruleType").change(function (){
 	//form表单提交
 	$("#ruleSubmit").click(function(){
-		if($.trim($("kpiMonitorTime").val())==""){
+		if($.trim($("#kpiMonitorTime").val())==""){
 			$.alert("指标监控时间不能为空");
 		}else if($("#businessTime").val()==""){
 			$.alert("指标业务时间不能为空");
@@ -257,58 +271,54 @@ $("#ruleBack").click(function(){
 		location.href="${ctx}/AnalysisSupport/QualityRuleResult";
 	});
-var dataSourceValue = $("#dataSource").val();
+function getProvinceCheckedValues() {
+	var provinceArray = new Array();
+	var i=0;
+	$("#province:checked").each(function(){
+	    provinceArray[i]=$(this).val();
+	    i++;
+	});
+	return provinceArray;
+}
+function getProvinceCheckedValuesString(){
+    var provinceStr="";
+    var provinceArray=getProvinceCheckedValues();
+    for(var i=0;i<provinceArray.length;i++){
+        if(i==provinceArray.length-1){
+            provinceStr+=provinceArray[i];
+        }else{
+            provinceStr+=provinceArray[i]+",";
+        }
+    }
+    return provinceStr;
+}
+var dataSourceValue =$("#dataSource").val();
 var channelValue = $("#channel").val();
+var businessIds = getBusinessCheckedValues();
+var calCycleValue =$("#calCycle").val();
 $("#dataSource").change(function(){
 	dataSourceValue = $("#dataSource").val();
-	console.log(dataSourceValue);
 	updateBusiness(dataSourceValue,channelValue);
 });	
 $("#channel").change(function(){
 	channelValue = $("#channel").val();
-	console.log(channelValue);
 	updateBusiness(dataSourceValue,channelValue);
 });
+function updateKpi(businessIds,calCycleValue){
-function getBusinessCheckedValues(){
-	var businessArray = new Array();
-	var i=0;
-	   $("#business:checked").each(function(){
-	       businessArray[i]=$(this).val();
-	       i++;
-	   });
-	   return businessArray;
-}
-function getBusinessCheckedValuesString(){
-	   var businessStr="";
-	   var businessArray=getBusinessCheckedValues();
-	   for(var i=0;i<businessArray.length;i++){
-	          if(i==businessArray.length-1){
-	                businessStr+=businessArray[i];
-	          }else{
-	                businessStr+=businessArray[i]+",";
-	          }
-	   }
-	   return businessStr;
-	}
-var businessIds = getBusinessCheckedValuesString();
-function updateKpi(businessIds){
 	$.ajax({
 		type : "GET",
 		contentType : "application/json",
-		url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findKpiId?businessIds="+businessIds,
+		url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findKpiId?businessIds="+businessIds+"&calCycleValue="+calCycleValue,
 		async: false,
 		beforeSend: function(data) {},
 		success: function(data){
 			var td = $("#kpitd");
 			td.empty();
-			console.log(data)
 			data = JSON.parse(data)
 			data.forEach(function(t){
 				td.append("<input type='checkbox' name='kpiinput' class='kpiItem' value='"+t[0]+"' checked >"+t[1]+"</input>")
@@ -318,7 +328,6 @@ function updateKpi(businessIds){
 }
 function updateBusiness(dataSource,channel){
-	console.log(dataSource,channel)
 	$.ajax({
 		type : "GET",
 		contentType : "application/json",
@@ -329,38 +338,101 @@ function updateBusiness(dataSource,channel){
 			var td = $("#businesstd");
 			var businessIds = new Array();
 			td.empty();
-			console.log(data)
 			data = JSON.parse(data)
-			console.log(data)
 			data.forEach(function(t){
 				td.append("<input type='checkbox' name='businessinput' class='businessItem' value='"+t[0]+"' checked >"+t[1]+"</input>")
 				businessIds+=t[0]+",";
-				console.log("ids:"+businessIds);
 			});
-			updateKpi(businessIds);
+			updateKpi(businessIds,calCycleValue);
 		}
 	});
+    $(".businessItem").click(function(){
+        businessIds="";
+        $("[name='businessinput']:checked").each(function (){
+            businessIds += $(this).val()+",";
+        });
+        updateKpi(businessIds,calCycleValue);
+    });
+}
+$("#calCycle").change(function () {
+    calCycleValue=$("#calCycle").val();
+    $("[name='businessinput']:checked").each(function (){
+        businessIds += $(this).val()+",";
+    });
+    updateKpi(businessIds,calCycleValue)
+	updateBusinessTime(calCycleValue)
+});
+updateBusiness($("#dataSource").val(),$("#channel").val());
+function updateBusinessTime(calCycleValue) {
+    $("#businessTimetd").empty()
+	if(calCycleValue == "30MI"){
+	        $("#businessTimetd").append("<input type='text' class='form-control' id='businessTime' name='businessTime' onfocus='WdatePicker({dateFmt:\"yyyy-MM-dd HH:mm:00\",readOnly:false,hmsMenuCfg : {H : [ 1, 6 ], m : [ 30, 2 ], s : [ 60, 0 ]}})'/>");
+	}else if(calCycleValue == "01HR"){
+            $("#businessTimetd").append("<input type='text' class='form-control' id='businessTime' name='businessTime' onfocus='WdatePicker({dateFmt:\"yyyy-MM-dd HH:00:00\",readOnly:false,hmsMenuCfg : {H : [ 1, 6 ], m : [ 30, 2 ], s : [ 60, 0 ]}})'/>");
+	}else if(calCycleValue == "01DY"){
+            $("#businessTimetd").append("<input type='text' class='form-control' id='businessTime' name='businessTime' onfocus='WdatePicker({dateFmt:\"yyyy-MM-dd 00:00:00\",readOnly:false,hmsMenuCfg : {H : [ 24, 0 ], m : [ 60, 0 ], s : [ 60, 0 ]}})'/>");
+	}else if(calCycleValue == "01MO"){
+            $("#businessTimetd").append("<input type='text' class='form-control' id='businessTime' name='businessTime' onfocus='WdatePicker({dateFmt:\"yyyy-MM-01 00:00:00\",readOnly:false,hmsMenuCfg : {H : [ 24, 0 ], m : [ 60, 0 ], s : [ 60, 0 ]}})' />");
+	}
+}
-$("#business").click(function(){
+function getBusinessCheckedValues(){
-	var clickFlag=true;
+    var businessArray = new Array();
-	$("#business").each(function(){
+    var i=0;
-		if($(this).attr("checked") == null||$(this).attr("checked") == false){	clickFlag=false;}
+    $("[name='businessinput']:checked").each(function(){
+        businessArray[i]=$(this).val();
+        i++;
    });
-	$("#business").attr("checked",clickFlag);
+    return businessArray;
-	updateKpi(businessIds);
+}
-});
+function getBusinessCheckedValuesString(){
+    var businessStr="";
+    var businessArray=getBusinessCheckedValues();
+    for(var i=0;i<businessArray.length;i++){
+        if(i==businessArray.length-1){
+            businessStr+=businessArray[i];
+        }else{
+            businessStr+=businessArray[i]+",";
+        }
+    }
+    return businessStr;
+}
+function getKpiCheckedValues(){
+    var kpiArray = new Array();
+    var i=0;
+    $("[name='kpiinput']:checked").each(function(){
+        kpiArray[i]=$(this).val();
+        i++;
+    });
+    return kpiArray;
+}
+function getKpiCheckedValuesString(){
+    var kpiStr="";
+    var kpiArray=getKpiCheckedValues();
+    for(var i=0;i<kpiArray.length;i++){
+        if(i==kpiArray.length-1){
+            kpiStr+=kpiArray[i];
+        }else{
+            kpiStr+=kpiArray[i]+",";
+        }
+    }
+    return kpiStr;
+}
+var provinceValue = getProvinceCheckedValuesString();
+var businessValue = getBusinessCheckedValuesString();
+var kpiValue = getKpiCheckedValuesString();
+console.log("provinceValue:"+provinceValue+"businessValue："+businessValue+"kpiValue："+kpiValue)
-}
 </script>
 </body>

--- a/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp
+++ b/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp
@@ -206,48 +206,7 @@ $("#createRule").click(function(){
 				lock:true
 	});
-			//查看准确性规则
-			function lookParm(qualityRuleId){
-					$.dialog({
-						title:"准确性规则",
-						content:"<div id='paramList'>"+
-						"<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>参数列表</div><div class='panel-body'> <table class='table table-hover table-striped'> <thead> <tr> <th width='20%'>参数ID号</th> <th width='35%'>参数名</th> <th width='20%'>参数值</th> <th width='25%'>参数类型</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
-						"</div>",
-						lock:true,
-						width:800,
-						initialize:function(){
-							$.ajax({
-								type : 'GET',
-								contentType : 'application/json',
-								url: "${ctx}/AnalysisSupport/QualityRuleResult/findAccuracy?qualityRuleId="+qualityRuleId,
-								dataType : 'text',
-								beforeSend: function(data) { 
-								},
-								success: function(data){
-									for(var i=0;i<data.length;i++){
-					                      if(data[i]=='\"'){
-					                         data=data.replace('\"','\'');
-					                      }             
-					  }
-				data=eval("("+data+")");
-				if(data!=null && data!=""){
-					var paramTbody = $('#paramList tbody');
-					for(var i=0;i<data.length;i++){
-					if(data[i].parameterValue=="undefined" || data[i].parameterValue==null || data[i].parameterValue==""){
-						data[i].parameterValue="";
-				}
-				paramTbody.append($("<tr></tr>").append("<td>"+data[i].parameterId+"</td>")
-													 					  .append("<td>"+data[i].parameterName+"</td>")
-													 					  .append("<td>"+data[i].parameterValue+"</td>")
-													 					  .append("<td>"+data[i].parameterDataType+"</td>"));
-					}
-				}
-			}
-			});
-		}
-});
-}
 	});
 	}
 </script>

--- a/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp
+++ b/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp
--- a/src/main/webapp/static/js/dygraph-combined2.js
+++ b/src/main/webapp/static/js/dygraph-combined2.js
@@ -417,6 +417,7 @@ printStackTrace.implementation.prototype = {
        a = a || this.createException();
        b = b || this.mode(a);
        if (b === "other") {
+            // noinspection JSAnnotator
            return this.other(arguments.callee)
        } else {
            return this[b](a)

--- a/src/main/webapp/static/js/ruleResultDetailTable.js
+++ b/src/main/webapp/static/js/ruleResultDetailTable.js
 //格式化日期
 function Format(){
-this.jsjava_class="jsjava.text.Format";
+    this.jsjava_class="jsjava.text.Format";
 }
 function DateFormat(){
-this.jsjava_class="jsjava.text.DateFormat";
+    this.jsjava_class="jsjava.text.DateFormat";
 }
 DateFormat.prototype=new Format();
 DateFormat.prototype.constructor=DateFormat;
@@ -19,101 +19,101 @@ DateFormat.zh_cn_pm="\u4e0a\u5348";
 DateFormat.language=(navigator.userLanguage==undefined?navigator.language:navigator.userLanguage).replace("-","_").toLowerCase();
 DateFormat.prototype.format=function(date){
-var year4=date.getFullYear();
+    var year4=date.getFullYear();
-var year2=year4.toString().substring(2);
+    var year2=year4.toString().substring(2);
-var pattern=this.pattern;
+    var pattern=this.pattern;
-pattern=pattern.replace(/yyyy/,year4);
+    pattern=pattern.replace(/yyyy/,year4);
-pattern=pattern.replace(/yy/,year2);
+    pattern=pattern.replace(/yy/,year2);
-var month=date.getMonth();
+    var month=date.getMonth();
-pattern=pattern.replace(/MMMM/,eval("DateFormat."+DateFormat.language+"_month4[month]"));
+    pattern=pattern.replace(/MMMM/,eval("DateFormat."+DateFormat.language+"_month4[month]"));
-pattern=pattern.replace(/MMM/,eval("DateFormat."+DateFormat.language+"_month3[month]"));
+    pattern=pattern.replace(/MMM/,eval("DateFormat."+DateFormat.language+"_month3[month]"));
-pattern=pattern.replace(/MM/,eval("DateFormat."+DateFormat.language+"_month2[month]"));
+    pattern=pattern.replace(/MM/,eval("DateFormat."+DateFormat.language+"_month2[month]"));
-var dayOfMonth=date.getDate();
+    var dayOfMonth=date.getDate();
-var dayOfMonth2=dayOfMonth;
+    var dayOfMonth2=dayOfMonth;
-var dayOfMonthLength=dayOfMonth.toString().length;
+    var dayOfMonthLength=dayOfMonth.toString().length;
-if(dayOfMonthLength==1){
+    if(dayOfMonthLength==1){
        dayOfMonth2="0"+dayOfMonth;
-}
+    }
-pattern=pattern.replace(/dd/,dayOfMonth2);
+    pattern=pattern.replace(/dd/,dayOfMonth2);
-pattern=pattern.replace(/d/,dayOfMonth);
+    pattern=pattern.replace(/d/,dayOfMonth);
-var hours=date.getHours();
+    var hours=date.getHours();
-var hours2=hours;
+    var hours2=hours;
-var hoursLength=hours.toString().length;
+    var hoursLength=hours.toString().length;
-if(hoursLength==1){
+    if(hoursLength==1){
        hours2="0"+hours;
-}
+    }
-pattern=pattern.replace(/HH/,hours2);
+    pattern=pattern.replace(/HH/,hours2);
-pattern=pattern.replace(/H/,hours);
+    pattern=pattern.replace(/H/,hours);
-var minutes=date.getMinutes();
+    var minutes=date.getMinutes();
-var minutes2=minutes;
+    var minutes2=minutes;
-var minutesLength=minutes.toString().length;
+    var minutesLength=minutes.toString().length;
-if(minutesLength==1){
+    if(minutesLength==1){
        minutes2="0"+minutes;
-}
+    }
-pattern=pattern.replace(/mm/,minutes2);
+    pattern=pattern.replace(/mm/,minutes2);
-pattern=pattern.replace(/m/,minutes);
+    pattern=pattern.replace(/m/,minutes);
-var seconds=date.getSeconds();
+    var seconds=date.getSeconds();
-var seconds2=seconds;
+    var seconds2=seconds;
-var secondsLength=seconds.toString().length;
+    var secondsLength=seconds.toString().length;
-if(secondsLength==1){
+    if(secondsLength==1){
        seconds2="0"+seconds;
-}
+    }
-pattern=pattern.replace(/ss/,seconds2);
+    pattern=pattern.replace(/ss/,seconds2);
-pattern=pattern.replace(/s/,seconds);
+    pattern=pattern.replace(/s/,seconds);
-var milliSeconds=date.getMilliseconds();
+    var milliSeconds=date.getMilliseconds();
-pattern=pattern.replace(/S+/,milliSeconds);
+    pattern=pattern.replace(/S+/,milliSeconds);
-var day=date.getDay();
+    var day=date.getDay();
 // pattern=pattern.replace(/E+/,eval("DateFormat."+DateFormat.language+"_week[day]"));
-if(hours>12){
+    if(hours>12){
        pattern=pattern.replace(/a+/,eval("DateFormat."+DateFormat.language+"_am"));
-}else{
+    }else{
        pattern=pattern.replace(/a+/,eval("DateFormat."+DateFormat.language+"_pm"));
-}
+    }
-var kHours=hours;
+    var kHours=hours;
-if(kHours==0){
+    if(kHours==0){
        kHours=24;
-}
+    }
-var kHours2=kHours;
+    var kHours2=kHours;
-var kHoursLength=kHours.toString().length;
+    var kHoursLength=kHours.toString().length;
-if(kHoursLength==1){
+    if(kHoursLength==1){
        kHours2="0"+kHours;
-}
+    }
-pattern=pattern.replace(/kk/,kHours2);
+    pattern=pattern.replace(/kk/,kHours2);
-pattern=pattern.replace(/k/,kHours);
+    pattern=pattern.replace(/k/,kHours);
-var KHours=hours;
+    var KHours=hours;
-if(hours>11){
+    if(hours>11){
        KHours=hours-12;
-}
+    }
-var KHours2=KHours;
+    var KHours2=KHours;
-var KHoursLength=KHours.toString().length;
+    var KHoursLength=KHours.toString().length;
-if(KHoursLength==1){
+    if(KHoursLength==1){
        KHours2="0"+KHours;
-}
+    }
-pattern=pattern.replace(/KK/,KHours2);
+    pattern=pattern.replace(/KK/,KHours2);
-pattern=pattern.replace(/K/,KHours);
+    pattern=pattern.replace(/K/,KHours);
-var hHours=KHours;
+    var hHours=KHours;
-if(hHours==0){
+    if(hHours==0){
        hHours=12;
-}
+    }
-var hHours2=hHours;
+    var hHours2=hHours;
-var hHoursLength=hHours.toString().length;
+    var hHoursLength=hHours.toString().length;
-if(KHoursLength==1){
+    if(KHoursLength==1){
        hHours2="0"+hHours;
-}
+    }
-pattern=pattern.replace(/hh/,hHours2);
+    pattern=pattern.replace(/hh/,hHours2);
-pattern=pattern.replace(/h/,hHours);
+    pattern=pattern.replace(/h/,hHours);
-return pattern;
+    return pattern;
 };
 function SimpleDateFormat(){
-this.jsjava_class="jsjava.text.SimpleDateFormat";
+    this.jsjava_class="jsjava.text.SimpleDateFormat";
 }
 SimpleDateFormat.prototype=new DateFormat();
 SimpleDateFormat.prototype.constructor=SimpleDateFormat;
 SimpleDateFormat.prototype.applyPattern=function(pattern){
-this.pattern=pattern;
+    this.pattern=pattern;
 };
 var df=new SimpleDateFormat();
@@ -128,24 +128,25 @@ function ruleResultDetailTable(){
 	 header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""];
 	 header[1] = ["质量规则ID","qualityRuleId","7%","15"];
-	 header[2] = ["数据来源","dataSourceName","7%","15"];
+	 header[2] = ["数据来源","dataSourceId","7%","15"];
-	 header[3] = ["渠道","channelName","7%","15"];
+	 header[3] = ["渠道","channelId","7%","15"];
-	 header[4] = ["业务","businessName","7%","15"];
+	 header[4] = ["业务","businessId","7%","15"];
-	 header[5] = ["指标名称","qualityRuleId","7%","15"];
+	 header[5] = ["指标名称","kpiId","7%","15"];
-	 header[6] = ["指标编码","qualityRuleId","7%","15"];
+	 header[6] = ["指标编码","kpiCode","7%","15"];
-	 header[7] = ["数据类型","qualityRuleId","7%","15"];
+	 header[7] = ["数据类型","dataSourceId","7%","15"];
-	 header[8] = ["数据采集频率","qualityRuleId","7%","15"];
+	 header[8] = ["数据采集频率","calCycle","7%","15"];
-	 header[9] = ["指标监控时间","qualityRuleId","7%","15"];
+	 header[9] = ["指标监控时间","kpiMonitorTime","7%","15"];
-	 header[10] = ["指标业务时间","qualityRuleId","7%","15"]; 
+	 header[10] = ["指标采集时间","businessTime","7%","15"];
-	 header[11] = ["准确性规则","qualityRuleId","7%","15"];
+	 header[11] = ["准确性规则","accuracyRuleId","7%","15"];
 	 window.pagging = new table_pagging({limit:12,tableId:'ruleResultTable',header:header});
-	//pagging.pagging(jsonData);
+	 pagging.pagging(jsonData);
 }
 var table_pagging = function() {
 	this.init.apply(this, arguments);
 }
 table_pagging.prototype = {
 		init : function(s) {
 			// 从第几个数据开始获取,缺省状态下从0开始显示
@@ -311,20 +312,9 @@ table_pagging.prototype = {
 	                                	}
 									}
 	                                if(k==11){
-	                                	tdContext = "<a href='javascript:;' onclick='lookParm(\""+this.getData(this.objectlist[i],"qualityRuleId")+"\")'>查看参数</a>";
+	                                	tdContext = "<a href='javascript:;' onclick='selectRule(\""+this.getData(this.objectlist[i],"qualityRuleId")+"\")'>查看规则</a>";
-	                                 }
-	                                if(k==4){
-	                                	if (this.header[k][4] && !(tdContext == "&nbsp;")) {
-	                						td.title = tdTitle;
-	                						tdContext = tdContext + "";
-	                						if (tdContext.length > parseInt(this.header[k][4])) {
-	                							tdContext = tdContext.substring(0,
-	                									this.header[k][4])
-	                									+ "..";
-	                						}
-	                					}
 	                                 }
 								}
 							} else {
 								     tdContext=this.header[k][1]+"<span style='display:none'>"+i+"</span>";
@@ -342,15 +332,6 @@ table_pagging.prototype = {
 							tdTitle = tdContext;
 						}
-						if (this.header[k][3] && !(tdContext == "&nbsp;")) {
-							td.title = tdTitle;
-							tdContext = tdContext + "";
-							if (tdContext.length > parseInt(this.header[k][3])) {
-								tdContext = tdContext.substring(0,
-										this.header[k][3])
-										+ "..";
-							}
-						}
 						console.log(tdContext);
@@ -543,4 +524,50 @@ table_pagging.prototype = {
 			ruleId=parseInt(obj[parseInt(clickObj.nextSibling.innerHTML)].qualityRuleId);
 		}
 	}
+//查看准确性规则
+function selectRule(qualityRuleId){
+    $.dialog({
+        title:"准确性规则",
+        content:"<div id='ruleList'>"+
+        "<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>规则参数列表</div><div class='panel-body'> <table class='table table-hover table-striped'> <thead> <tr> <th width='10%'>规则类型</th> <th width='15%'>范围最大值</th> <th width='15%'>范围最小值</th> <th width='15%'>重复考核粒度</th> <th width='15%'>重复考核开始时间</th> <th width='15%'>重复考核结束时间</th> <th width='15%'>重复是否连续</th> <th width='15%'>重复最大次数</th> <th width='15%'>数据是否累计</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
+        "</div>",
+        lock:true,
+        width:800,
+        initialize:function(){
+            $.ajax({
+                type : 'GET',
+                contentType : 'application/json',
+                url: "/AnalysisSupport/QualityRuleResult/findAccuracy?qualityRuleId="+qualityRuleId,
+                dataType : 'text',
+                beforeSend: function(data) {
+                },
+                success: function(data) {
+                    for (var i = 0; i < data.length; i++) {
+                        if (data[i] == '\"') {
+                            data = data.replace('\"', '\'');
+                        }
+                    }
+                    data = eval("(" + data + ")");
+                    if (data != null && data != "") {
+                        var ruleTbody = $('#ruleList tbody');
+                        for (var i = 0; i < data.length; i++) {
+                            ruleTbody.append($("<tr></tr>").append("<td>" + data[i].ruleType + "</td>")
+                                .append("<td>" + (data[i].scopeMaxValue == null ? "" : data[i].scopeMaxValue) + "</td>")
+                                .append("<td>" + (data[i].scopeMinValue == null ? "" : data[i].scopeMinValue) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckGranularity == null ? "" : data[i].repeatedCheckGranularity) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckStartTime == null ? "" : data[i].repeatedCheckStartTime) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckEndTime == null ? "" : data[i].repeatedCheckEndTime) + "</td>")
+                                .append("<td>" + (data[i].ifRepeatedCheckSeries == null ? "" : data[i].ifRepeatedCheckSeries) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckMaxTime == null ? "" : data[i].repeatedCheckMaxTime) + "</td>")
+                                .append("<td>" + (data[i].ifRepeatedCheckSummation == null ? "" : data[i].ifRepeatedCheckSummation) + "</td>"));
+                        }
+                    }
+                }
+            });
+        }
+    });
+}