Skip to content

C
cmszMonitorAnalysis
Commit 0897f6b5 authored by afe's avatar afe
Browse files
Options

2017年10月29提交内容

--实现预警与隐患维护的协查单预览与下发
parent 708f30ca
Hide whitespace changes
Inline Side-by-side
Showing with 555 additions and 437 deletions
.idea/workspace.xml
View file @ 0897f6b5
......@@ -7,11 +7,18 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/CmszMonitorAnalysis.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/CmszMonitorAnalysis.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ModelDataType.tag" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag" />
<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/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/web/monitoroperation/WorkingOrderManageControll.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<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/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/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" />
<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/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
</list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
......@@ -30,45 +37,39 @@
<file leaf-file-name="WorkingOrderManage.jsp" pinned="false" current-in-tab="false">
<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="-2795">
<caret line="429" column="98" lean-forward="false" selection-start-line="429" selection-start-column="89" selection-end-line="429" selection-end-column="98" />
<state relative-caret-position="386">
<caret line="1244" column="77" lean-forward="false" selection-start-line="1244" selection-start-column="59" selection-end-line="1244" selection-end-column="77" />
<folding>
<element signature="e#2644#9347#0#HTML" expanded="false" />
<element signature="e#18604#19698#0#HTML" expanded="false" />
<element signature="e#47189#52674#0#HTML" expanded="false" />
<element signature="e#53404#58234#0#HTML" expanded="false" />
<marker date="1508295925796" expanded="true" signature="47279:47337" ph="..." />
<marker date="1508295925796" expanded="true" signature="52969:53025" ph="..." />
<marker date="1508295925796" expanded="true" signature="53191:53202" ph="..." />
<element signature="e#53244#53432#0#HTML" expanded="false" />
<element signature="e#53475#53674#0#HTML" expanded="false" />
<element signature="e#53717#53915#0#HTML" expanded="false" />
<element signature="e#53958#54162#0#HTML" expanded="false" />
<element signature="e#54182#54239#0#HTML" expanded="false" />
<marker date="1509280248843" expanded="true" signature="41326:41384" ph="..." />
<marker date="1509280248843" expanded="true" signature="47047:47103" ph="..." />
<marker date="1509280248843" expanded="true" signature="47326:47337" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="xcdWarningTable.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
<file leaf-file-name="WorkingOrderCreate.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="624" column="39" lean-forward="false" selection-start-line="624" selection-start-column="39" selection-end-line="624" selection-end-column="39" />
<state relative-caret-position="285">
<caret line="319" column="91" lean-forward="false" selection-start-line="319" selection-start-column="81" selection-end-line="319" selection-end-column="91" />
<folding>
<element signature="e#5943#6867#0" expanded="false" />
<element signature="e#6895#6900#0" expanded="false" />
<element signature="e#7241#7453#0" expanded="false" />
<element signature="e#7497#7597#0" expanded="false" />
<element signature="e#7640#7998#0" expanded="false" />
<marker date="1508295974631" expanded="true" signature="10349:10361" ph="..." />
<marker date="1508295974631" expanded="true" signature="10644:10656" ph="..." />
<marker date="1508295974631" expanded="true" signature="15170:15180" ph="..." />
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<file leaf-file-name="WorkingOrderCreateController.java" pinned="false" current-in-tab="true">
<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="110">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<state relative-caret-position="135">
<caret line="774" column="40" lean-forward="true" selection-start-line="774" selection-start-column="40" selection-end-line="774" selection-end-column="40" />
<folding />
</state>
</provider>
......@@ -78,23 +79,7 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>预警和隐患列表</find>
<find>closeButton</find>
<find>submit</find>
<find>a_home</find>
<find>ids</find>
<find>updateWorkingOrder</find>
<find>pagging</find>
<find>warningId</find>
<find>jsonDataxcdWarningInfoJson</find>
<find>xcdWarningInfoJson</find>
<find>jsonData</find>
<find>objectlist</find>
<find>risk</find>
<find>riskpicpath</find>
<find>riskp</find>
<find>warningSourceId</find>
<find>xcdWarningJsonId</find>
<find>dialog</find>
<find>opendialog</find>
<find>&lt;hr&gt;</find>
......@@ -103,11 +88,27 @@
<find>openDialog</find>
<find>$(&quot;#create&quot;).attr(&quot;disabled&quot;, false);</find>
<find>$(&quot;#preview&quot;).attr(&quot;disabled&quot;, true);</find>
<find>checkRel</find>
<find>WorkingOrderCreate</find>
<find>事件所属系统类型</find>
<find>create</find>
<find>$(&quot;#create&quot;).attr(&quot;disabled&quot;, true);</find>
<find>生成协查单</find>
<find>createWorkingDetail</find>
<find>create</find>
<find>xcdWarningJsonId</find>
<find>open</find>
<find>ids</find>
<find>alert</find>
<find>check</find>
<find>checkRel</find>
<find>relStatus</find>
<find>投诉文本分析</find>
<find>preview</find>
<find>warningIdTwo</find>
<find>WorkingOrderCreate</find>
<find>export</find>
<find>home</find>
<find>exportWord</find>
<find>alarm</find>
<find>alarmMsg</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -121,10 +122,21 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
<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/XCD_RelStatus.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js" />
<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/layouts/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
</list>
</option>
</component>
......@@ -163,8 +175,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="AndroidView" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
......@@ -173,11 +185,56 @@
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="MonitorOperation" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -186,7 +243,7 @@
<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$/../../../大屏后台/cm/IntegratedOperationPlatformBackStage" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Color Scheme Font" />
<property name="ignore_missing_gitignore" value="true" />
</component>
......@@ -202,81 +259,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Tomcat Server.Unnamed">
<configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.47" ALTERNATIVE_JRE_ENABLED="false">
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATING_POLICY" value="redeploy-artifacts" />
<deployment>
<artifact name="CmszMonitorAnalysis">
<settings>
<option name="CONTEXT_PATH" value="/" />
</settings>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="Unnamed_trunk_4" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="64028" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method>
<option name="BuildArtifacts" enabled="true">
<artifact name="CmszMonitorAnalysis" />
</option>
</method>
</configuration>
<component name="RunManager" selected="Tomcat Server.cmszAnalysisMonitor">
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
......@@ -370,17 +353,20 @@
<properties />
<listeners />
</configuration>
<configuration name="cmszMonitorAnalysis" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.47" ALTERNATIVE_JRE_ENABLED="false">
<option name="UPDATING_POLICY" value="restart-server" />
<configuration name="cmszAnalysisMonitor" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.47" ALTERNATIVE_JRE_ENABLED="false">
<option name="COMMON_VM_ARGUMENTS" value="-server -XX:PermSize=128M -XX:MaxPermSize=256m" />
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATING_POLICY" value="redeploy-artifacts" />
<deployment>
<file path="$PROJECT_DIR$/src/main/webapp">
<artifact name="CmszMonitorAnalysis">
<settings>
<option name="CONTEXT_PATH" value="/" />
</settings>
</file>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="Unnamed_trunk_3" />
<option name="BASE_DIRECTORY_NAME" value="Unnamed_trunk_4" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
......@@ -389,7 +375,7 @@
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="60892" />
<option name="DEBUG_PORT" value="64028" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
......@@ -436,11 +422,12 @@
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method>
<option name="BuildArtifacts" enabled="true">
<artifact name="CmszMonitorAnalysis" />
</option>
</method>
</configuration>
<list size="2">
<item index="0" class="java.lang.String" itemvalue="Tomcat Server.cmszMonitorAnalysis" />
<item index="1" class="java.lang.String" itemvalue="Tomcat Server.Unnamed" />
</list>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
......@@ -464,7 +451,13 @@
<workItem from="1507951076866" duration="195000" />
<workItem from="1508141982582" duration="52000" />
<workItem from="1508203865307" duration="24226000" />
<workItem from="1508291541991" duration="7205000" />
<workItem from="1508291541991" duration="11057000" />
<workItem from="1508316165522" duration="2533000" />
<workItem from="1508375812938" duration="1578000" />
<workItem from="1508377544056" duration="24000" />
<workItem from="1508899490498" duration="11000" />
<workItem from="1508984208384" duration="3899000" />
<workItem from="1509068199920" duration="12642000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
......@@ -487,14 +480,21 @@
<option name="project" value="LOCAL" />
<updated>1507830194949</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="2017年10月18日提交记录&#10;--预警与隐患维护页面列表上方增加结果预览按钮&#10;--告警详细页面用列表的方式展示选中的多个协查单信息&#10;--告警详细页面给每个协查单添加告警描述，可编辑&#10;--生成协查单页面增加生成内部协查单按钮（功能未实现）">
<created>1508309038723</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1508309038723</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47323000" />
<option name="totallyTimeSpent" value="71862000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1380" height="744" extended-state="6" />
<frame x="-8" y="-8" width="1616" height="876" 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="3" 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.32730263" sideWeight="0.50454545" order="13" side_tool="true" content_ui="tabs" />
......@@ -509,19 +509,18 @@
<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="3" 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="5" 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="9" 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.32840723" sideWeight="0.5" order="17" 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.32837838" sideWeight="0.5" order="17" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" 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="14" 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="6" 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.61019737" sideWeight="0.4969697" order="3" 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.42837837" sideWeight="0.4969697" order="3" 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.32730263" sideWeight="0.49545455" order="18" 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="20" 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="22" 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.3181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33354756" 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="7" 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.33" sideWeight="0.5" order="2" 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="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="2" side_tool="true" 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="8" 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="5" 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="12" side_tool="false" content_ui="tabs" />
......@@ -530,6 +529,7 @@
<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="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="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="7" 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">
......@@ -578,7 +578,8 @@
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="first commit" />
<option name="LAST_COMMIT_MESSAGE" value="first commit" />
<MESSAGE value="2017年10月18日提交记录&#10;--预警与隐患维护页面列表上方增加结果预览按钮&#10;--告警详细页面用列表的方式展示选中的多个协查单信息&#10;--告警详细页面给每个协查单添加告警描述，可编辑&#10;--生成协查单页面增加生成内部协查单按钮（功能未实现）" />
<option name="LAST_COMMIT_MESSAGE" value="2017年10月18日提交记录&#10;--预警与隐患维护页面列表上方增加结果预览按钮&#10;--告警详细页面用列表的方式展示选中的多个协查单信息&#10;--告警详细页面给每个协查单添加告警描述，可编辑&#10;--生成协查单页面增加生成内部协查单按钮（功能未实现）" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -590,7 +591,7 @@
<option name="timeStamp" value="17" />
</line-breakpoint>
</breakpoints>
<option name="time" value="22" />
<option name="time" value="24" />
</breakpoint-manager>
<watches-manager />
</component>
......@@ -607,387 +608,395 @@
</buildFile>
</component>
<component name="editorHistoryManager">
<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/webapp/WEB-INF/views/AnalysisSupport/TSWBAnalysisHome.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="10" column="44" lean-forward="false" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<state relative-caret-position="418">
<caret line="30" column="101" lean-forward="false" selection-start-line="30" selection-start-column="89" selection-end-line="30" selection-end-column="101" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZDetailData.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzTemplate.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="34" />
<state relative-caret-position="330">
<caret line="54" column="64" lean-forward="false" selection-start-line="54" selection-start-column="64" selection-end-line="54" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/log4jdbc.log4j2.properties">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="264">
<caret line="28" column="21" lean-forward="false" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbFocusDataTable.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-438">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="473">
<caret line="32" column="29" lean-forward="false" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZFocusData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="57" column="39" lean-forward="false" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="39" />
<folding />
<state relative-caret-position="141">
<caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZFocusDataDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="154">
<caret line="12" column="27" lean-forward="false" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spy.properties">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5246">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="2178">
<caret line="119" column="47" lean-forward="false" selection-start-line="119" selection-start-column="47" selection-end-line="119" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/CmszOperationLogService.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="22" column="16" lean-forward="false" selection-start-line="22" selection-start-column="16" selection-end-line="22" selection-end-column="16" />
<state relative-caret-position="171">
<caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_FocusData.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzfocus.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="28" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="28" />
<state relative-caret-position="946">
<caret line="43" column="34" lean-forward="false" selection-start-line="43" selection-start-column="34" selection-end-line="43" selection-end-column="34" />
</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/webapp/WEB-INF/views/AnalysisSupport/TswbYzFocusDataTable.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="13" column="39" lean-forward="false" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="39" />
<state relative-caret-position="22">
<caret line="23" column="57" lean-forward="false" selection-start-line="23" selection-start-column="57" selection-end-line="23" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzTemplateDataTable.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="42" column="9" lean-forward="true" selection-start-line="42" selection-start-column="9" selection-end-line="42" selection-end-column="9" />
<state relative-caret-position="22">
<caret line="191" column="0" lean-forward="false" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/paging.tag">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="56" column="13" lean-forward="true" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
<state relative-caret-position="88">
<caret line="4" column="35" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/filter/XssFilter.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/filter/SSOFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="29" column="29" lean-forward="true" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
<state relative-caret-position="22">
<caret line="47" column="5" lean-forward="false" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/RiskEarlyWarning.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="83">
<caret line="23" column="30" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="30" />
<state relative-caret-position="172">
<caret line="20" column="25" lean-forward="false" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/RiskEarlyWarningDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-409">
<caret line="188" column="35" lean-forward="false" selection-start-line="188" selection-start-column="35" selection-end-line="188" selection-end-column="35" />
<state relative-caret-position="220">
<caret line="20" column="81" lean-forward="true" selection-start-line="20" selection-start-column="81" selection-end-line="20" selection-end-column="81" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZTemplateData.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="24" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="24" />
<state relative-caret-position="172">
<caret line="20" column="40" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZLiabilityData.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<state relative-caret-position="194">
<caret line="24" column="84" lean-forward="false" selection-start-line="24" selection-start-column="84" selection-end-line="24" selection-end-column="84" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZDetailDataDao.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="11" column="70" lean-forward="false" selection-start-line="11" selection-start-column="46" selection-end-line="11" selection-end-column="70" />
<state relative-caret-position="22">
<caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZLiabilityDataDao.java">
<entry file="file://$PROJECT_DIR$/.classpath">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="11" column="31" lean-forward="false" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_TZTemplateDataDao.java">
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbFocus.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/filter/RepeatCommitFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="93">
<caret line="22" column="171" lean-forward="true" selection-start-line="22" selection-start-column="120" selection-end-line="22" selection-end-column="171" />
<folding>
<element signature="e#1188#1930#0#HTML" expanded="false" />
</folding>
<state relative-caret-position="22">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzDetailDataTable.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureAnalysisDetailDisplayController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-189">
<caret line="13" column="26" lean-forward="false" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
<state relative-caret-position="194">
<caret line="591" column="51" lean-forward="false" selection-start-line="591" selection-start-column="44" selection-end-line="591" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzLiabilityDataTable.jsp">
<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="396">
<caret line="24" column="32" lean-forward="false" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
<state relative-caret-position="-462">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzLiability.jsp">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="54" column="129" lean-forward="false" selection-start-line="54" selection-start-column="69" selection-end-line="54" selection-end-column="129" />
<state relative-caret-position="110">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TSWBAnalysisHome.jsp">
<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="418">
<caret line="30" column="101" lean-forward="false" selection-start-line="30" selection-start-column="89" selection-end-line="30" selection-end-column="101" />
<state relative-caret-position="-858">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzTemplate.jsp">
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar!/com/google/gson/Gson.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="54" column="64" lean-forward="false" selection-start-line="54" selection-start-column="64" selection-end-line="54" selection-end-column="64" />
<state relative-caret-position="194">
<caret line="20" column="11" lean-forward="false" selection-start-line="20" selection-start-column="11" selection-end-line="20" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzDetail.jsp">
<entry file="jar://$PROJECT_DIR$/../../jdk1.6.0_18/jre/lib/rt.jar!/java/io/PrintWriter.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="28" column="21" lean-forward="false" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
<state relative-caret-position="110">
<caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbFocusDataTable.jsp">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="32" column="29" lean-forward="false" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
<state relative-caret-position="66">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_YZFocusData.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxWarningInfoDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="141">
<caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<state relative-caret-position="194">
<caret line="71" column="30" lean-forward="false" selection-start-line="71" selection-start-column="30" selection-end-line="71" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_YZFocusDataDao.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="12" column="27" lean-forward="false" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
<state relative-caret-position="107">
<caret line="22" column="26" lean-forward="false" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
</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/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2178">
<caret line="119" column="47" lean-forward="false" selection-start-line="119" selection-start-column="47" selection-end-line="119" selection-end-column="47" />
<state relative-caret-position="2386">
<caret line="398" column="62" lean-forward="false" selection-start-line="398" selection-start-column="62" selection-end-line="398" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
<state relative-caret-position="176">
<caret line="8" column="32" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="31" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzfocus.jsp">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="946">
<caret line="43" column="34" lean-forward="false" selection-start-line="43" selection-start-column="34" selection-end-line="43" selection-end-column="34" />
<state relative-caret-position="348">
<caret line="135" column="36" lean-forward="false" selection-start-line="135" selection-start-column="36" selection-end-line="135" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/TswbYzFocusDataTable.jsp">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_modelResult_DeployedServerTag.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="23" column="57" lean-forward="false" selection-start-line="23" selection-start-column="57" selection-end-line="23" selection-end-column="57" />
<state relative-caret-position="0">
<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/web/analysissupport/TSWBAnalysisController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="191" column="0" lean-forward="false" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
<state relative-caret-position="132">
<caret line="6" column="11" lean-forward="true" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_TitleSearch.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="35" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="35" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="19" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/filter/SSOFilter.java">
<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="22">
<caret line="47" column="5" lean-forward="false" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
<state relative-caret-position="418">
<caret line="46" column="51" lean-forward="true" selection-start-line="46" selection-start-column="51" selection-end-line="46" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/RiskEarlyWarning.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ModelDataType.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172">
<caret line="20" column="25" lean-forward="false" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
<state relative-caret-position="220">
<caret line="10" column="17" lean-forward="true" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/RiskEarlyWarningDao.java">
<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="220">
<caret line="20" column="81" lean-forward="true" selection-start-line="20" selection-start-column="81" selection-end-line="20" selection-end-column="81" />
<state relative-caret-position="-1188">
<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="1486961647819" expanded="true" signature="9495:9501" ph="&amp;nbsp;" />
<marker date="1486961647819" expanded="true" signature="9501:9507" ph="&amp;nbsp;" />
</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/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172">
<caret line="20" column="40" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="40" />
<state relative-caret-position="280">
<caret line="27" column="100" lean-forward="false" selection-start-line="27" selection-start-column="84" selection-end-line="27" selection-end-column="100" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskLogList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="24" column="84" lean-forward="false" selection-start-line="24" selection-start-column="84" selection-end-line="24" selection-end-column="84" />
<state relative-caret-position="-1986">
<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/service/monitoroperation/XcdWorkingOrderInfoService.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskDetailListDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.classpath">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskLogListTable.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<state relative-caret-position="-190">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.xml">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<state relative-caret-position="-198">
<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/filter/RepeatCommitFilter.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<state relative-caret-position="308">
<caret line="14" column="102" lean-forward="false" selection-start-line="14" selection-start-column="102" selection-end-line="14" selection-end-column="102" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureAnalysisDetailDisplayController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="591" column="51" lean-forward="false" selection-start-line="591" selection-start-column="44" selection-end-line="591" selection-end-column="51" />
<state relative-caret-position="282">
<caret line="145" column="34" lean-forward="false" selection-start-line="145" selection-start-column="34" selection-end-line="145" selection-end-column="34" />
<folding>
<marker date="1508987890292" expanded="true" signature="20616:20640" ph="..." />
<marker date="1508987890292" expanded="true" signature="20853:20867" ph="..." />
<marker date="1508987890292" expanded="true" signature="21134:21148" ph="..." />
<marker date="1508987890292" expanded="true" signature="21417:21431" ph="..." />
<marker date="1508987890292" expanded="true" signature="21589:21606" ph="..." />
</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/webapp/WEB-INF/views/index.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="410" column="40" lean-forward="false" selection-start-line="410" selection-start-column="40" selection-end-line="410" selection-end-column="40" />
<state relative-caret-position="0">
<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/WorkingOrderCreate.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2243">
<caret line="251" column="45" lean-forward="false" selection-start-line="251" selection-start-column="45" selection-end-line="251" selection-end-column="45" />
<folding />
<state relative-caret-position="285">
<caret line="319" column="91" lean-forward="false" selection-start-line="319" selection-start-column="81" selection-end-line="319" selection-end-column="91" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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="-2795">
<caret line="429" column="98" lean-forward="false" selection-start-line="429" selection-start-column="89" selection-end-line="429" selection-end-column="98" />
<state relative-caret-position="386">
<caret line="1244" column="77" lean-forward="false" selection-start-line="1244" selection-start-column="59" selection-end-line="1244" selection-end-column="77" />
<folding>
<element signature="e#2644#9347#0#HTML" expanded="false" />
<element signature="e#18604#19698#0#HTML" expanded="false" />
<element signature="e#47189#52674#0#HTML" expanded="false" />
<element signature="e#53404#58234#0#HTML" expanded="false" />
<marker date="1508295925796" expanded="true" signature="47279:47337" ph="..." />
<marker date="1508295925796" expanded="true" signature="52969:53025" ph="..." />
<marker date="1508295925796" expanded="true" signature="53191:53202" ph="..." />
<element signature="e#53244#53432#0#HTML" expanded="false" />
<element signature="e#53475#53674#0#HTML" expanded="false" />
<element signature="e#53717#53915#0#HTML" expanded="false" />
<element signature="e#53958#54162#0#HTML" expanded="false" />
<element signature="e#54182#54239#0#HTML" expanded="false" />
<marker date="1509280248843" expanded="true" signature="41326:41384" ph="..." />
<marker date="1509280248843" expanded="true" signature="47047:47103" ph="..." />
<marker date="1509280248843" expanded="true" signature="47326:47337" ph="..." />
</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/commons/utils/ExportWordUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="624" column="39" lean-forward="false" selection-start-line="624" selection-start-column="39" selection-end-line="624" selection-end-column="39" />
<folding>
<element signature="e#5943#6867#0" expanded="false" />
<element signature="e#6895#6900#0" expanded="false" />
<element signature="e#7241#7453#0" expanded="false" />
<element signature="e#7497#7597#0" expanded="false" />
<element signature="e#7640#7998#0" expanded="false" />
<marker date="1508295974631" expanded="true" signature="10349:10361" ph="..." />
<marker date="1508295974631" expanded="true" signature="10644:10656" ph="..." />
<marker date="1508295974631" expanded="true" signature="15170:15180" ph="..." />
</folding>
<state relative-caret-position="-554">
<caret line="280" column="23" lean-forward="false" selection-start-line="280" selection-start-column="23" selection-end-line="280" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<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="110">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<state relative-caret-position="135">
<caret line="774" column="40" lean-forward="true" selection-start-line="774" selection-start-column="40" selection-end-line="774" selection-end-column="40" />
<folding />
</state>
</provider>
......
src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java
View file @ 0897f6b5
......@@ -136,11 +136,13 @@ public class WorkingOrderCreateController {
String picname = "";
String eventsubcheck = "";
String eventkindcheck = "";
String alarmMsg;
//协查单生成页面
@RequestMapping(method = RequestMethod.GET)
public String WorkingOrderCreate(@RequestParam(value = "warningId") String warningIds, Map model,
public String WorkingOrderCreate(@RequestParam(value = "warningId") String warningIds,@RequestParam(value = "msg") String msg, Map model,
ServletRequest request, HttpSession session) {
alarmMsg = msg;
warningIdTwo = warningIds;
String[] warningid = warningIds.split(",");
List<String> wid = changeStrToList(warningid);
......@@ -697,6 +699,8 @@ public class WorkingOrderCreateController {
int year = cal.get(Calendar.YEAR);//获取年份
int month = cal.get(Calendar.MONTH) + 1;//获取月份
System.out.println("@@@@@@@@@@@@@@@@@@@@"+alarmMsg);
String [] alarmMsgArr = alarmMsg.split("|");
String[] warningids = warningIdTwo.split(",|,");
List<String> ids = changeStrToList(warningids);
List<XcdWarningInfoView> xcdWarningInfoViews = xcdWarningInfoViewDao.findByWarningIdIn(ids);
......@@ -929,21 +933,21 @@ public class WorkingOrderCreateController {
}
}
} else { //隐患，去特定的目录取图片，隐患图片放在linux下/home/pentaho/picture目录中
if (xcdWarningInfoViews.get(i).getRiskPictureFileName() != null
&& !xcdWarningInfoViews.get(i).getRiskPictureFileName().equals("")) {
String imgFile = "/home/pentaho/picture"
+ xcdWarningInfoViews.get(i).getRiskPictureFileName().trim();
File file = null;
try {
file = new File(imgFile);
} catch (Exception e) {
logger.warn(imgFile + "下无此图片！");
}
if (file != null) {
byte[] bytes = ExportWordUtil.convertImageToByteArray(file);
ExportWordUtil.addImageToPackage(wordMLPackage, bytes);
}
}
// if (xcdWarningInfoViews.get(i).getRiskPictureFileName() != null
// && !xcdWarningInfoViews.get(i).getRiskPictureFileName().equals("")) {
// String imgFile = "/home/pentaho/picture"
// + xcdWarningInfoViews.get(i).getRiskPictureFileName().trim();
// File file = null;
// try {
// file = new File(imgFile);
// } catch (Exception e) {
// logger.warn(imgFile + "下无此图片！");
// }
// if (file != null) {
// byte[] bytes = ExportWordUtil.convertImageToByteArray(file);
// ExportWordUtil.addImageToPackage(wordMLPackage, bytes);
// }
// }
}
ExportWordUtil.addLineBreak(wordMLPackage, factory);
......
src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java
View file @ 0897f6b5
......@@ -411,8 +411,8 @@ public class WorkingOrderManageControll {
catch (IOException ex1) {
ex1.printStackTrace();
}finally{
out.close();
}
out.close();
}
}
......
src/main/webapp/WEB-INF/layouts/header.jsp
View file @ 0897f6b5
......@@ -139,7 +139,10 @@
<ul class="dropdown-menu">
<li><a href="${ctx}/MonitorOperation/WorkingOrderManage">预警和隐患维护</a></li>
<li><a href="${ctx}/MonitorOperation/WarnAnalysis">告警统计</a></li>
<li><a href="${ctx}/MonitorOperation/WarnAnalysisDetail">告警明细</a></li>
<li><a href="${ctx}/MonitorOperation/WarnAnalysisDetail">告警明细</a></li>
<%--create by hubin 2017-10-26 功能未实现 --%>
<li><a href="${ctx}/">内部协查单管理</a></li>
</ul>
</li>
</shiro:hasPermission>
......
src/main/webapp/WEB-INF/tags/ModelDataType.tag 0 → 100644
View file @ 0897f6b5
<%@tag pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%--数据类型 --%>
<div id="model_dataType" class="slide-menu-option">
<div class="slide-select">
<label >数据类型：</label><br/>
<select class="slide-menu-select" id="relStatus" name="relStatus">
<option value="业务量类" title="业务量类" selected><a href="#">业务量类</a></option>
<option value="时长类" title="时长类" ><a href="#">时长类</a></option>
<option value="百分比类" title="百分比类" ><a href="#">百分比类</a></option>
</select>
</div>
</div>
</script>
\ No newline at end of file
src/main/webapp/WEB-INF/tags/WarningFilter.tag 0 → 100644
View file @ 0897f6b5
<%@tag pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<c:set var="ctx" value="${pageContext.request.contextPath}" />
<!-- 协查单管理页面中的告警关联协查单的状态 -->
<div id="ws3" class="slide-menu-option">
<label>告警是否过滤</label> <!-- <div class="slide-select"> -->
<select class="slide-menu-select" id="relStatus" name="relStatus">
<option value="是" title="是" ><a href="#">是</a></option>
<option value="否" title="否" selected><a href="#">否</a></option>
</select>
<!-- </div> -->
</div>
<script type="text/javascript">
// function getStatus(){
// return $("#relStatus").val();
// }
// function getStatusName(){
//
// return $("#relStatus").find("option:selected").attr("title");
// }
// function StatusReset(){
// $("#relStatus").val("0,1,2,3");
// }
</script>
\ No newline at end of file
src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag
View file @ 0897f6b5
......@@ -11,8 +11,6 @@
<option value="未确认" title="未确认"><a href="#">未确认</a></option>
<option value="已确认" title="已确认"><a href="#">已确认</a></option>
<option value="已关联协查单" title="已关联协查单"><a href="#">已关联协查单</a></option>
</select>
<!-- </div> -->
</div>
......
src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp
View file @ 0897f6b5
......@@ -44,6 +44,8 @@
<tags:FXJM_modelResult_DataModelTypeTag/>
<tags:FXJM_Status/>
<tags:FXJM_TitleSearch/>
<tags:ModelDataType/>
<!-- <tags:FXJM_modelResult_DeployedServerTag/> -->
<button id="submit" class="btn btn-primary" onclick="modelResultSubmit()">提交</button>
<button id="disable" class="btn btn-warning" onclick="modelResultReset()">重置</button>
......
src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp
View file @ 0897f6b5
......@@ -248,8 +248,7 @@
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<input type="button" id="confirmId" class="btn btn-primary" value="确认">
0
<input type="button" id="confirmId" class="btn btn-primary" value="确认">
<input type="button" id="back" class="btn btn-warning" value="返回">
<input type="button" id="createInsideWorkingOrder" class="btn btn-success" value="生成内部协查单">
......
src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp
View file @ 0897f6b5
......@@ -437,12 +437,13 @@
});
$("#preview").click(function () {
// alert(ids.join(","))
batchOpenDialog(ids)
});
})
......@@ -542,9 +543,10 @@ th{
<tags:Public_ProvinceTag />
<tags:XCD_WarningStatus />
<tags:XCD_RelStatus />
<tags:WarningFilter />
<div id="workingOrderIDDiv" class="slide-menu-option">
<label for="">协查单编号</label>&nbsp;&nbsp;
<label >协查单编号</label>&nbsp;&nbsp;
<input id="workingOrderID" class="form-control" type="text" style="width:250px;" onFocus="">
</div>
<div id="earlyWarningIDDiv" class="slide-menu-option">
......@@ -723,7 +725,7 @@ th{
$("#submit").click(function(){
var inputs = document.getElementById("xcdWarningTable").getElementsByTagName("input");
for(var i = 0; i < inputs.length; i++) {
if (inputs[i].type == 'checkbox') {
if (inputs[i].type === 'checkbox') {
inputs[i].checked=false;
}
}
......@@ -752,18 +754,18 @@ th{
var relStatus=getRelStatus();
var code=$.trim(document.getElementById("workingOrderID").value);
var earlyWarnId = $.trim(document.getElementById("earlyWarningID").value);
if(code=="" && earlyWarnId==""){
if(code==="" && earlyWarnId===""){
if(dataSource==""){
$.alert("数据来源的选择不能为空");
}else if(chnnal==""){
}else if(chnnal===""){
$.alert("渠道的选择不能为空");
}else if(bussines==""){
}else if(bussines===""){
$.alert("业务的选择不能为空");
}else if(provider==""){
}else if(provider===""){
$.alert("集成商的选择不能为空");
}else if(level==""){
}else if(level===""){
$.alert("告警级别的选择不能为空");
}else if(province==""){
}else if(province===""){
$.alert("省份的选择不能为空");
}else{
toggleMenu('slidePushMenus');//隐藏筛选项
......@@ -833,7 +835,7 @@ th{
});
}
}else{
if(code!="" && earlyWarnId==""){
if(code!=="" && earlyWarnId===""){
$("#PeriodTag").empty();
$("#workingOrderIDTag").text(code);
href="${ctx}/MonitorOperation/WorkingOrderManage/changeTable?warningSource="+warningSource
......@@ -928,8 +930,9 @@ th{
});
//筛选项重置按钮
$("#reset").click(function(){
$('#riskEarlyWarningType').empty();
$('#riskEarlyWarningType').append("<option value='1,2,3,4,5,6,7,8' selected><a href='#'>全部</a></option>");
var $riskEarlyWarningType = $('#riskEarlyWarningType')
$riskEarlyWarningType.empty();
$riskEarlyWarningType.append("<option value='1,2,3,4,5,6,7,8' selected><a href='#'>全部</a></option>");
$('#warningSource')[0].selectedIndex = 0;
statsDataSourceReset();//三级联动重置
initDate();//预警或隐患查询页面的时间初始化
......@@ -992,76 +995,32 @@ th{
returninfo2=getParamValue("returninfo");
if(returninfo2!=null){
$.alert(decodeURIComponent(returninfo2));
/* location.href="${ctx}/MonitorOperation/WorkingOrderManage"; */
}
});
/* //add by Eric 2014-05-15 17:52 start
//链接至告警明细相关信息页面
function openDialog(warningID,WarningSourceTag,DataSourceTag,channelId,businessId,kpiId,configItemId,provinceId,warningTitle,provinceName,channelName,businessName,dataSourceName,warningSourceName,kpiCode,kpiName,ciCode,ciName,providerName,importanceLevelName,occurTime,closeTime,workingOrderCode,relevantFailureId,riskEarlyWarningTypeId,dataModelName,closestatus,warningStatus) {
$.dialog({
title:'告警明细相关信息页面 告警ID:'+warningID,
content:"<div class='dialog-p'>"
+ "<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>告警明细</div><div class='panel-body'><table class='table table-vertical'><tr><td>告警标题</td><td colspan='7'>"+warningTitle+"</td></tr><tr><td width='10%'>告警ID</td><td>"+warningID+"</td><td width='10%'>省份</td><td>"+provinceName+"</td><td width='10%'>业务</td><td>"+businessName+"</td><td width='10%'>渠道</td><td>"+channelName+"</td></tr><tr><td>指标编码</td><td>"+kpiCode+"</td><td>指标名称</td><td>"+kpiName+"</td><td>相关集成商</td><td>"+providerName+"</td><td>告警级别</td><td>"+importanceLevelName+"</td></tr><tr><td>配置项编码</td><td>"+ciCode+"</td><td>配置项名称</td><td>"+ciName+"</td><td>关闭类型</td><td>"+closestatus+"</td><td>告警状态</td><td>"+warningStatus+"</td></tr><tr><td>发生时间</td><td>"+occurTime+"</td><td>结束时间</td><td>"+closeTime+"</td><td>协查单号</td><td>"+workingOrderCode+"</td><td>故障单号</td><td>"+relevantFailureId+"</td></tr><tr><td>分析模型</td><td>"+dataModelName+"</td><td width='10%'>数据来源</td><td>"+dataSourceName+"</td><td width='10%'>告警来源</td><td>"+warningSourceName+"</td><td></td><td></td></tr></table> </div> </div> </div>"//告警明细，参数从外部传入
// + ((WarningSourceTag==2||WarningSourceTag==3)?"<div class='dialog-p'><div name='loading' class='loading' style='top:270px;height:300px'><img src='${ctx}/static/images/loading.gif'/></div><iframe id='ewarningIf' style='height:300px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=208&WarningID="+warningID+"&WarningSourceTag="+WarningSourceTag+"&DataSourceTag="+ DataSourceTag+"&ChannelTag="+ channelId+"&BusinessTag="+ businessId+"&KPITag="+ kpiId+"&ConfigItemTag="+ configItemId+"&ProvinceTag="+ provinceId+"&occurTimeTag="+((occurTime!='')?occurTime:"2014-01-01 00:00:00") +"'></iframe></div><br/>":"")//iframe，当为预警或隐患时显示iframe
+ ((WarningSourceTag==2)?"<div class='dialog-p'><div name='loading' class='loading' style='top:270px;height:300px'><img src='${ctx}/static/images/loading.gif'/></div><iframe id='ewarningIf' style='height:300px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=272&WarningID="+warningID+"&WarningSourceTag="+WarningSourceTag+"&ctx=${ctx}"+"'></iframe></div><br/>":"")//当为预警时显示iframe,110:35
+ ((WarningSourceTag==3)?"<div class='dialog-p'><div name='loading' class='loading' style='top:270px;height:560px'><img src='${ctx}/static/images/loading.gif'/></div><iframe id='ewarningIf' style='height:560px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=534&WarningID="+warningID+"&WarningSourceTag="+WarningSourceTag+"&ctx=${ctx}" +"'></iframe></div><br/>":"")//当为隐患时显示iframe,8:5
+ "<div id='xcdList'> "
+ "<div class='col-xs-6'><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='15%'>编号</th> <th width='45%'>协查单标题</th> <th width='20%'>开始时间</th> <th width='20%'>结束时间</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div> "//协查单
+ "<div class='col-xs-6'><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='15%'>编号</th> <th width='45%'>变更单标题</th> <th width='20%'>开始时间</th> <th width='20%'>结束时间</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div> "//变更单
+"</div>",
lock: true,
initialize:function(){
$('#ewarningIf').load( function(){ $(this).parent().find('.loading').fadeOut("fast"); });
var ajax_url='${ctx}/MonitorOperation/WarnAnalysisDetail/getWorkingOrderInfo/'+warningID+'/'+((warningStatus=='已关联协查单')?'null':riskEarlyWarningTypeId)+'/';//当已关联协查单时为null，输出关联的协查单；其他情况传入分析模型id继续查找协查单并输出
$.ajax({
type : 'GET',
contentType : 'application/json',
url: ajax_url,
dataType : 'text',
beforeSend: function(data) {},
success: function(data) {
var obj = JSON.parse(data), //由JSON字符串转换为JSON对象
a_link=" target='_blank' href='${ctx}/MonitorOperation/WorkingOrderDetail?xcdCode=";
for(var j=0;j<obj.length&&j<$('#xcdList tbody').length;j++){
for(var i=0;i<obj[j].length;i++){
$('#xcdList tbody').eq(j).append($("<tr></tr>")
.append((String(obj[j][i][0]).length<27)?//当字数多于两行时隐藏用省略号，协查单时需添加链接
(j==0)?$("<td></td>").append($("<a"+a_link+obj[j][i][0]+"'></a>").html(obj[j][i][0])):$("<td></td>").html(obj[j][i][0]):
(j==0)?$("<td></td>").attr('title',obj[j][i][0]).append($("<a"+a_link+obj[j][i][0]+"'></a>").html(obj[j][i][0].substring(0,26)+'..')):$("<td></td>").attr('title',obj[j][i][0]).html(obj[j][i][0].substring(0,26)+'..'))
.append((String(obj[j][i][1]).length<27)?
$("<td></td>").html(obj[j][i][1]):
$("<td></td>").attr('title',obj[j][i][1]).html(obj[j][i][1].substring(0,26)+'..'))
.append("<td>"+((obj[j][i][2]!=null&&obj[j][i][2]!='')?formatDate(obj[j][i][2],"yyyy-MM-dd HH:mm:ss"):"")+"</td>")
.append("<td>"+((obj[j][i][3]!=null&&obj[j][i][3]!='')?formatDate(obj[j][i][3],"yyyy-MM-dd HH:mm:ss"):"")+"</td>"));
}
}
}
});
}
});
}
//add by Eric 2014-05-15 17:52 end */
//change by Eric 2014-08-10 18:49
function getCol(json,name){return (json[name]!=null)?json[name]:'';}//防止空值时出现undefined
//链接至告警明细相关信息页面
function openDialog(i) {
/*function openDialog(i) {
console.log(i)
var data = JSON.parse($('#xcdWarningJsonId').val())[i];
$.dialog({
title:'告警明细相关信息页面 告警ID:'+data['warningId'],
title:'告警明细相关信息页面 告警ID:'+data['warningId'],
content:"<div class='dialog-p'style='max-height: 560px; overflow-y: scroll; overflow-x: hidden;'>"
+ "<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>告警明细</div><div class='panel-body'><table class='table table-vertical'><tr><td>告警标题</td><td colspan='5'>"+getCol(data,'warningTitle')+"</td><td>告警ID</td><td>"+getCol(data,'warningId')+"</td></tr><tr><td width='10%'>省份</td><td>"+getCol(data,'provinceName')+"</td><td width='10%'>数据来源</td><td>"+getCol(data,'dataSourceName')+"</td><td width='10%'>业务</td><td>"+getCol(data,'businessName')+"</td><td width='10%'>渠道</td><td>"+getCol(data,'channelName')+"</td></tr><tr><td>指标编码</td><td>"+getCol(data,'kpiCode')+"</td><td>指标名称</td><td>"+getCol(data,'kpiName')+"</td><td>相关集成商</td><td>"+getCol(data,'providerName')+"</td><td>告警级别</td><td>"+getCol(data,'importanceLevelName')+"</td></tr><tr><td>配置项编码</td><td>"+getCol(data,'ciCode')+"</td><td>配置项名称</td><td>"+getCol(data,'ciName')+"</td><td>关闭类型</td><td>"+getCol(data,'closestatus')+"</td><td>告警状态</td><td>"+getCol(data,'warningstatus')+"</td></tr><tr><td>发生时间</td><td>"+((data['occurTime']!=null)?df.format(new Date(data['occurTime'])):"")+"</td><td>结束时间</td><td>"+((data['closeTime']!=null)?df.format(new Date(data['closeTime'])):"")+"</td><td>协查单号</td><td>"+getCol(data,'workingOrderCode')+"</td><td>故障单号</td><td>"+getCol(data,'relevantFailureId')+"</td></tr><tr><td>模型名称</td><td>"+getCol(data,'dataModelName')+"</td><td width='10%'>模型类型</td><td>"+getCol(data,'dataModelTypeName')+"</td><td width='10%'>告警来源</td><td>"+getCol(data,'warningSourceName')+"</td><td>告警类型</td><td>"+getCol(data,'riskEarlyWarningTypeName')+"</td></tr></table> </div> </div> </div>"
+ ((getCol(data,'warningSourceId')==2)?"<div class='dialog-p'><div name='loading' class='loading' style='top:270px;height:300px'><img src='${ctx}/static/images/loading.gif'/></div><iframe id='ewarningIf' style='height:300px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=272&WarningID="+getCol(data,'warningId')+"&WarningSourceTag="+getCol(data,'warningSourceId')+"&ctx=${ctx}"/*+"&DataSourceTag="+ getCol(data,'dataSourceId')+"&ChannelTag="+ getCol(data,'channelId')+"&BusinessTag="+ getCol(data,'businessId')+"&KPITag="+ getCol(data,'kpiId')+"&ConfigItemTag="+ getCol(data,'configItemId')+"&ProvinceTag="+ getCol(data,'provinceId')+"&occurTimeTag="+((getCol(data,'occurTime')!='')?getCol(data,'occurTime'):"2014-01-01 00:00:00") */+"'></iframe></div><br/>":"")//当为预警时显示iframe,110:35
+ ((getCol(data,'warningSourceId')==3)?"<div class='dialog-p'><div name='loading' class='loading' style='top:270px;height:560px'><img src='${ctx}/static/images/loading.gif'/></div><iframe id='ewarningIf' style='height:560px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=534&WarningID="+getCol(data,'warningId')+"&WarningSourceTag="+getCol(data,'warningSourceId')+"&ctx=${ctx}"/*+"&DataSourceTag="+ getCol(data,'dataSourceId')+"&ChannelTag="+ getCol(data,'channelId')+"&BusinessTag="+ getCol(data,'businessId')+"&KPITag="+ getCol(data,'kpiId')+"&ConfigItemTag="+ getCol(data,'configItemId')+"&ProvinceTag="+ getCol(data,'provinceId')+"&occurTimeTag="+((getCol(data,'occurTime')!='')?getCol(data,'occurTime'):"2014-01-01 00:00:00")*/ +"'></iframe></div><br/>":"")//当为隐患时显示iframe,8:5
+ ((getCol(data,'warningSourceId')==2)?"<div class='dialog-p'><div name='loading' class='loading' style='top:270px;height:300px'><img src='${ctx}/static/images/loading.gif'/></div><iframe id='ewarningIf' style='height:300px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=272&WarningID="+getCol(data,'warningId')+"&WarningSourceTag="+getCol(data,'warningSourceId')+"&ctx=${ctx}"/!*+"&DataSourceTag="+ getCol(data,'dataSourceId')+"&ChannelTag="+ getCol(data,'channelId')+"&BusinessTag="+ getCol(data,'businessId')+"&KPITag="+ getCol(data,'kpiId')+"&ConfigItemTag="+ getCol(data,'configItemId')+"&ProvinceTag="+ getCol(data,'provinceId')+"&occurTimeTag="+((getCol(data,'occurTime')!='')?getCol(data,'occurTime'):"2014-01-01 00:00:00") *!/+"'></iframe></div><br/>":"")//当为预警时显示iframe,110:35
+ ((getCol(data,'warningSourceId')==3)?"<div class='dialog-p'><div name='loading' class='loading' style='top:270px;height:560px'><img src='${ctx}/static/images/loading.gif'/></div><iframe id='ewarningIf' style='height:560px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=534&WarningID="+getCol(data,'warningId')+"&WarningSourceTag="+getCol(data,'warningSourceId')+"&ctx=${ctx}"/!*+"&DataSourceTag="+ getCol(data,'dataSourceId')+"&ChannelTag="+ getCol(data,'channelId')+"&BusinessTag="+ getCol(data,'businessId')+"&KPITag="+ getCol(data,'kpiId')+"&ConfigItemTag="+ getCol(data,'configItemId')+"&ProvinceTag="+ getCol(data,'provinceId')+"&occurTimeTag="+((getCol(data,'occurTime')!='')?getCol(data,'occurTime'):"2014-01-01 00:00:00")*!/ +"'></iframe></div><br/>":"")//当为隐患时显示iframe,8:5
+"</div>",
lock: true,
lock: true,
initialize:function(){
$('#ewarningIf').load( function(){
$(this).parent().find('.loading').fadeOut("fast");
$('#ewarningIf').load( function(){
$(this).parent().find('.loading').fadeOut("fast");
//if(getCol(data,'warningSourceId')==2){ saveReportImg([[data['warningId'],$(this)[0]]],0,0); }
});
var ajax_url='${ctx}/MonitorOperation/WarnAnalysisDetail/getWorkingOrderInfo/'+data['warningId']+'/'+((getCol(data,'warningstatus')=='已关联协查单')?'null':getCol(data,'riskEarlyWarningTypeId'))+'/';//当已关联协查单时为null，输出关联的协查单；其他情况传入分析模型id继续查找协查单并输出
......@@ -1085,15 +1044,15 @@ th{
$("<td></td>").html(obj[j][i][1]):
$("<td></td>").attr('title',obj[j][i][1]).html(obj[j][i][1].substring(0,26)+'..'))
.append("<td>"+((obj[j][i][2]!=null&&obj[j][i][2]!='')?formatDate(obj[j][i][2],"yyyy-MM-dd HH:mm:ss"):"")+"</td>")
.append("<td>"+((obj[j][i][3]!=null&&obj[j][i][3]!='')?formatDate(obj[j][i][3],"yyyy-MM-dd HH:mm:ss"):"")+"</td>"));
.append("<td>"+((obj[j][i][3]!=null&&obj[j][i][3]!='')?formatDate(obj[j][i][3],"yyyy-MM-dd HH:mm:ss"):"")+"</td>"));
}
}
}
});
}
});
}
});
}*/
var showIds=[];
function batchOpenDialog(ids) {
if(ids.length>10){
$.alert("批量结果预览最多展示10条数据");
......@@ -1103,13 +1062,15 @@ function batchOpenDialog(ids) {
if(typeof ids === "number"){
ids = [data[ids].warningId]
}
showIds=ids;
var content ="<div class='dialog-p' style='max-height: 560px; overflow-y: scroll; overflow-x: auto;'>" +
" <div class='col-xs-12'>" +
" <div class='panel panel-default'>" +
" <div class='panel-heading'>告警明细<input style='float:right' type='button' class='btn btn-primary' value='生成协查单'></div>" +
" <div class='panel-heading'>告警明细<input onclick='createWorkingDetail()' id='createWorkingDetail' style='float:right' type='button' class='btn btn-primary' value='生成协查单'></div>" +
" <div class='panel-body'>"+
" <table class='table table-vertical'>";
ids.forEach(function (t) {
// showIds.push(t);
data.forEach(function (t1) {
if(t1.warningId === t){
content= content+"<tr><td>";
......@@ -1173,7 +1134,7 @@ function batchOpenDialog(ids) {
" </tr>" +
" <tr>" +
" <td>告警描述</td>" +
" <td colspan='7'><input id='alarmMsg' type='text' class='form-control'></td>" +
" <td colspan='7'><input class='alarmMsg' type='text' class='form-control'></td>" +
" </tr>" +
" <tr>" +
" <td colspan='8' align='center'>图表展示</td>" +
......@@ -1193,10 +1154,8 @@ function batchOpenDialog(ids) {
}
})
})
});
content = content+"</table></div></div></div>";
$.dialog({
title:'告警明细相关信息页面 告警ID:'+ids,
content:content,
......@@ -1204,10 +1163,95 @@ function batchOpenDialog(ids) {
});
}
function createWorkingDetail() {
var warningIds="";
for(var i=0;i<showIds.length;i++){
if(i<showIds.length-1){
warningIds+=showIds[i]+",";
}else{
warningIds+=showIds[i];
}
}
// alert(warningIds)
var k=0;
var m=0;
var n=0;
var x=0;
var href="${ctx}/MonitorOperation/WorkingOrderManage/checkRel?warningId="+showIds;
$.ajax({
type : 'GET',
contentType : 'application/json',
url: href,
dataType : 'text',
beforeSend: function(data) {
},
success: function(data) {
var json=JSON.parse(data);
for(var i=0;i<json.length;i++){
if(json[i].warningStatus==2){
// alert(json[i].relevantWorkingOrderId);
k++;
}
}
for(var i=0;i<json.length;i++){
for(var j=i+1;j<json.length;j++){
if(json[i].provinceId!=json[j].provinceId){
m++;
}
}
}
for(var p=0;p<json.length;p++){
for(var q=p+1;q<json.length;q++){
if(json[p].channelId!==json[q].channelId){
n++;
}
}
}
for(var y=0;y<json.length;y++){
for(var z=y+1;z<json.length;z++){
if(json[y].dataSourceId!==json[z].dataSourceId){
x++;
}
}
}
if(k>0){
$.alert("已关联协查单, 请重新选择");
}
else{
if(m>0||n>0||x>0){
$.alert("请选择同一省份同一渠道同一数据来源的告警来创建协查单！");
}else{
var msgArr = document.getElementsByClassName("alarmMsg");
var msg = "";
for(var i=0;i<msgArr.length;i++){
if(i===msgArr.length-1){
msg = msg+msgArr[i].value
}else{
msg = msg+ msgArr[i].value+"|"
}
}
console.log(msg)
location.href="${ctx}/MonitorOperation/WorkingOrderCreate?warningId="+warningIds+"&msg="+msg;
}
}
}
});
}
//end change by eric 2014-08-10 18:50
</script>
......
src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp
View file @ 0897f6b5
......@@ -5,18 +5,28 @@
<div class="table-header">任务列表
<div id="time_div" style="top: -6px;float: right;height: 0px;position: relative;">
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="changeTaskStatus('1')">运行</button>
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="changeTaskStatus('2')">暂停</button>
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="editTask();">修改</button>
<button class="btn-sm btn btn-warning btn-sm btn-group btn-group-cog" onclick="deleteTask();">删除</button>
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="addTask();">新建</button>
<%--create by afe 2017-10-26--%>
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="">模型预览</button>
</div>
</div>
<table class="table table-hover table-striped">
<thead>
<tr>
<th>选择</th>
<th>任务代码</th>
<%--2017-10-26 create by afe--%>
<%--<th>任务代码</th>--%>
<th>省份</th>
<th>渠道</th>
<th>业务名称</th>
<th>数据类型</th>
<th>任务名称</th>
<th>任务类型</th>
<th>任务绑定信息</th>
......
src/main/webapp/static/js/modelResultDetailTable.js
View file @ 0897f6b5
......@@ -133,10 +133,10 @@ function modelResultDetailTable(){
header[4] = ["模型执行脚本名称","modelScriptName","12%","15"];
header[5] = ["模型类别","dataModelTypeName","10%",""];
header[6] = ["部署服务器","serverName","8%",""];
//header[7] = ["模型运行频度分钟数","cycleMinutes","12%",""];
header[7] = ["模型发布时间","modelPublishTime","15%",""];
header[8] = ["模型修改时间","modelUpdateTime","15%",""];
header[9] = ["参数","modelParameter","9%",""];
header[7] = ["数据类型","cycleMinutes","12%",""];
header[8] = ["模型发布时间","modelPublishTime","15%",""];
header[9] = ["模型修改时间","modelUpdateTime","15%",""];
header[10] = ["参数","modelParameter","9%",""];
window.pagging = new table_pagging({limit:12,tableId:'modelResultTable',header:header});
pagging.pagging(jsonData);
......
src/main/webapp/static/js/xcdWarningTable.js
View file @ 0897f6b5
var ids = new Array();//存放选中了的ID号
ids = [];
var ids = [];//存放选中了的ID号
var warlen;
//格式化日期
function Format(){
this.jsjava_class="jsjava.text.Format";
......@@ -294,11 +295,11 @@ table_pagging.prototype = {
var tdTitle = "";
if (this.header[k][1]) {
var reg = /\%\{([\d\w.]+)\}\%/g;
if (k != 0) {
if (k !== 0) {
if (result = reg.exec(this.header[k][1])) {
// var result = reg.exec(this.header[k][1]);
var context = this.header[k][1];
while (reg.lastIndex != 0) {
while (reg.lastIndex !== 0) {
var value = this.getData(
this.objectlist[i], result[1]);
context = context.replace(
......@@ -309,27 +310,27 @@ table_pagging.prototype = {
} else {
tdContext = this.getData(this.objectlist[i],this.header[k][1]);
if(tdContext==null){
if(tdContext===null){
tdContext = "&nbsp;";
}
//add by eric 2014-04-29 21:42 由预警和隐患列表链接到告警明细相关页面
if(k==1){
if(k===1){
tdContext="<a href='javascript:;' onclick='batchOpenDialog("+i
+")' alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
}
if(k==11){
if(tdContext!="&nbsp;"){
if(k===11){
if(tdContext!=="&nbsp;"){
tdContext = df.format(new Date(tdContext));
}
}else if(k==12){
if(tdContext!="&nbsp;"){
}else if(k===12){
if(tdContext!=="&nbsp;"){
tdContext = df.format(new Date(tdContext));
}
}else if(k==15){
if(tdContext=="已确认"){
}else if(k===15){
if(tdContext==="已确认"){
tr.className="green-tr";
}else if(tdContext=="已关联协查单"){
}else if(tdContext==="已关联协查单"){
tr.className="blue-tr";
}else{
tr.className="white-tr";
......@@ -341,7 +342,7 @@ table_pagging.prototype = {
tdContext="<input type='checkbox' name='cbox"+i+"' class='cbox1' onclick='javascript:checkChoose(this);'/>"+"<span style='display:none'>"+i+"</span>";
for ( var t = 0; t < ids.length; t++) {
if (ids[t] == this.getData(this.objectlist[i], this.header[1][1])){
if (ids[t] === this.getData(this.objectlist[i], this.header[1][1])){
tdContext="<input type='checkbox' name='cbox"+i+"' class='cbox1' checked onclick='javascript:checkChoose(this);'/>"+"<span style='display:none'>"+i+"</span>";
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment