Skip to content

C
cmszMonitorAnalysis
Commit 828413de authored by afe's avatar afe
Browse files
Options

2017年10月18日提交记录

--预警与隐患维护页面列表上方增加结果预览按钮 --告警详细页面用列表的方式展示选中的多个协查单信息 --告警详细页面给每个协查单添加告警描述，可编辑 --生成协查单页面增加生成内部协查单按钮（功能未实现）
parent dd6ae0b1
Show whitespace changes
Inline Side-by-side
Showing with 450 additions and 191 deletions
.gitignore 0 → 100644
View file @ 828413de
# Created by .ignore support plugin (hsz.mobi)
### Example user template template
### Example user template
# IntelliJ project files
*.iml
out
gen
.gitignore
.svn/
src/test/
.classpath
.project
CmszMonitorAnalysis.war
.externalToolBuilders
monitorAnalysis
.idea/artifacts/CmszMonitorAnalysis.xml
View file @ 828413de
......@@ -152,6 +152,7 @@
<element id="library" level="module" name="xmlsec-1.3.0-1.0.0.jar" module-name="CmszMonitorAnalysis" />
<element id="file-copy" path="$PROJECT_DIR$/lib/freemarker.jar" />
<element id="library" level="project" name="lib" />
<element id="library" level="application" name="servlet-api" />
</element>
</element>
<element id="javaee-facet-resources" facet="CmszMonitorAnalysis/web/Web" />
......
.idea/workspace.xml
View file @ 828413de
......@@ -7,7 +7,12 @@
</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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/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/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -21,7 +26,89 @@
<option name="refreshEnabled" value="true" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="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" />
<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="..." />
</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">
<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>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<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" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</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>
<find>\n</find>
<find>\</find>
<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>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -31,6 +118,16 @@
<projects_view />
</option>
</component>
<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" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
......@@ -66,6 +163,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="AndroidView" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -77,10 +177,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -89,8 +186,9 @@
<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$" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../../大屏后台/cm/IntegratedOperationPlatformBackStage" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Color Scheme Font" />
<property name="ignore_missing_gitignore" value="true" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
......@@ -104,7 +202,81 @@
</list>
</option>
</component>
<component name="RunManager" selected="Tomcat Server.cmszMonitorAnalysis">
<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>
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
......@@ -265,6 +437,10 @@
</SHUTDOWN>
</ConfigurationWrapper>
</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" />
......@@ -283,6 +459,12 @@
<workItem from="1507788873007" duration="4558000" />
<workItem from="1507793577506" duration="3725000" />
<workItem from="1507799737048" duration="2897000" />
<workItem from="1507876399464" duration="3219000" />
<workItem from="1507885454449" duration="138000" />
<workItem from="1507951076866" duration="195000" />
<workItem from="1508141982582" duration="52000" />
<workItem from="1508203865307" duration="24226000" />
<workItem from="1508291541991" duration="7205000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
......@@ -309,45 +491,45 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11186000" />
<option name="totallyTimeSpent" value="47323000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1380" height="744" extended-state="6" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="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="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" 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" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="24" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="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="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="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="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="7" 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.61083746" sideWeight="0.4969697" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32730263" sideWeight="0.49545455" order="10" 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="11" 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="12" 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.3" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="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="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="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="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" 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" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" 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" />
<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" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -408,7 +590,7 @@
<option name="timeStamp" value="17" />
</line-breakpoint>
</breakpoints>
<option name="time" value="19" />
<option name="time" value="22" />
</breakpoint-manager>
<watches-manager />
</component>
......@@ -425,55 +607,6 @@
</buildFile>
</component>
<component name="editorHistoryManager">
<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="22">
<caret line="176" column="55" lean-forward="false" selection-start-line="176" selection-start-column="55" selection-end-line="176" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/YWGL_KeyLink_PeriodTag.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2403">
<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/tags/YWGL_DisplayTag.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="144" column="81" lean-forward="false" selection-start-line="144" selection-start-column="69" selection-end-line="144" selection-end-column="81" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/RegularityAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="215">
<caret line="55" column="48" lean-forward="false" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PZX_ChangeState.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-365">
<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/tags/TSWB_Detail_Period.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="135" lean-forward="false" selection-start-line="9" selection-start-column="135" selection-end-line="9" selection-end-column="135" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PZX_Detail_Period.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/PagingAndSortingRepository.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
......@@ -735,7 +868,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -743,7 +875,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -751,7 +882,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -759,7 +889,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -767,12 +896,6 @@
<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" />
<folding>
<marker date="1486961122000" expanded="true" signature="3800:4315" ph="SELECT TO_CH... " />
<marker date="1486961122000" expanded="true" signature="4473:4979" ph="select to_ch... " />
<marker date="1486961122000" expanded="true" signature="5256:5919" ph="SELECT TO_CH... " />
<marker date="1486961122000" expanded="true" signature="6216:6835" ph="SELECT TO_CH... " />
</folding>
</state>
</provider>
</entry>
......@@ -780,19 +903,17 @@
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
<entry file="file://$PROJECT_DIR$/.classpath">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="214" column="67" lean-forward="false" selection-start-line="214" selection-start-column="67" selection-end-line="214" selection-end-column="67" />
<folding />
<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$/build.xml">
<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" />
......@@ -800,6 +921,77 @@
</state>
</provider>
</entry>
<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="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/java/com/hp/cmsz/web/monitoroperation/FailureAnalysisDetailDisplayController.java">
<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>
</provider>
</entry>
<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="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" />
<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>
</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" />
<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="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<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" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......@@ -808,9 +1000,9 @@
<artifact-editor>
<show-content>
<type id="library" />
<type id="javaee-facet-resources" />
<type id="artifact" />
<type id="jpa-descriptors" />
<type id="javaee-facet-resources" />
</show-content>
</artifact-editor>
<last-edited>CmszMonitorAnalysis</last-edited>
......
src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp
View file @ 828413de
......@@ -249,8 +249,10 @@
<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="back" class="btn btn-warning" value="返回">
<input type="button" id="createInsideWorkingOrder" class="btn btn-success" value="生成内部协查单">
</div>
</div>
......
src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp
View file @ 828413de
......@@ -52,6 +52,7 @@
$("#PeriodTag").empty();
}
$("#businessSelectAreaStats").hide();
// 批量关闭
$("#closeButton").click( function() {
//获取分页复选的id值
......@@ -180,10 +181,12 @@
}
ids.splice(0,ids.length);
if (ids.length > 0) {
$("#preview").attr("disabled", false);
$("#create").attr("disabled", false);
$("#closeButton").attr("disabled", false);
$("#confirmButton").attr("disabled", false);
} else {
$("#preview").attr("disabled", true);
$("#create").attr("disabled", true);
$("#closeButton").attr("disabled", true);
$("#confirmButton").attr("disabled", true);
......@@ -211,9 +214,7 @@
});
//批量确认
$("#confirmButton").click( function() {
var warningIds="";
for(var i=0;i<ids.length;i++){
if(i<ids.length-1){
......@@ -337,10 +338,12 @@
}
ids.splice(0,ids.length);
if (ids.length > 0) {
$("#preview").attr("disabled", false);
$("#create").attr("disabled", false);
$("#closeButton").attr("disabled", false);
$("#confirmButton").attr("disabled", false);
} else {
$("#preview").attr("disabled", true);
$("#create").attr("disabled", true);
$("#closeButton").attr("disabled", true);
$("#confirmButton").attr("disabled", true);
......@@ -360,18 +363,8 @@
//用于初始化时间控件的默认时间值
initDate();//预警或隐患查询页面的时间初始化
//点击生成协查单按钮，跳转到生成协查单页面，并将相应的告警id传给生成协查单页面
$("#create").click(function(){
// var str="";
//
// $('input[name="warningid"]:checked').each(function(){ //根据checkbox的name去获取被选中的选项value(即warningid)
//
// str+=$(this).val()+";";
// });
var warningIds="";
for(var i=0;i<ids.length;i++){
if(i<ids.length-1){
......@@ -396,7 +389,7 @@
var json=JSON.parse(data);
for(var i=0;i<json.length;i++){
if(json[i].warningStatus==2){
// alert(json[i].relevantWorkingOrderId);
// alert(json[i].relevantWorkingOrderId);
k++;
}
......@@ -409,7 +402,6 @@
}
}
for(var p=0;p<json.length;p++){
for(var q=p+1;q<json.length;q++){
if(json[p].channelId!=json[q].channelId){
......@@ -428,7 +420,8 @@
}
if(k>0){
$.alert("已关联协查单, 请重新选择");
}else{
}
else{
if(m>0||n>0||x>0){
$.alert("请选择同一省份同一渠道同一数据来源的告警来创建协查单！");
......@@ -443,37 +436,21 @@
});
$("#preview").click(function () {
// alert(ids.join(","))
batchOpenDialog(ids)
})
});
//根据选择的告警，将其告警id传到协查单更新页面
function updateWorkingOrder(){
//页面刷新分页 var radio=document.getElementsByName("update");
//页面刷新分页 var radioLength=radio.length;
//页面刷新分页 for(var i=0;i<radioLength;i++)
//页面刷新分页 {
//页面刷新分页 if(radio[i].checked)
//页面刷新分页 {
//页面刷新分页 var workingOrderId=radio[i].value;
// alert(xcdId);
// window.location.href="${ctx}/MonitorOperation/WorkingOrderUpdate"+"?workingOrderId="+workingOrderId;
/*
seajs.use('${ctx}/static/artDialog/src/dialog',function(dialog) {
var d = dialog({
title : '更新协查单',
fixed:true,
width:'420px',
height:'400px',
content : "<p><div ><iframe width='100%' height='100%' frameborder='0' scrolling='no' src='${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId="
+ workingOrderId+ "'></iframe></div></p>",
});
d.showModal();
});
*/
//页面刷新分页 art.dialog.open('${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId='+workingOrderId,{
......@@ -543,7 +520,7 @@ th{
<ul class="nav nav-tabs">
<li class="active"><a id="a_home" href="#home" data-toggle="tab">预警和隐患维护</a></li>
<li><a id="a_home" href="${ctx}/MonitorOperation/WarnAnalysis">告警统计</a> </li>
<li><a id="a_home1" href="${ctx}/MonitorOperation/WarnAnalysis">告警统计</a> </li>
<li><a id="a_profile" href="${ctx}/MonitorOperation/WarnAnalysisDetail">告警明细</a> </li>
</ul>
</div>
......@@ -673,6 +650,7 @@ th{
<div class="table-header">预警和隐患列表
<shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis">
<div class="bt-list-import" >
<input type="button" id="preview" class="btn btn-primary" value="结果预览" disabled=true>
<input type="button" id="create" class="btn btn-primary" value="生成协查单" disabled=true><!-- onclick="window.location.href='${ctx}/MonitorOperation/WorkingOrderCreate'" -->
<input type="button" id="closeButton" value="关闭" class="btn btn-primary" disabled=true>
<input type="button" id="confirmButton" value="确认" style="margin-right:13px;"class="btn btn-primary" disabled=true>
......@@ -692,20 +670,6 @@ th{
</div>
<form action="#" method="get" id="listForm"></form>
<!-- <input type="hidden" id="period" name="period" value="" />
<input type="hidden" id="warningSource" name="warningSource" value=""/>
<input type="hidden" id="risk" name="risk" value=""/>
<input type="hidden" id="dataSource" name="dataSource" value=""/>
<input type="hidden" id="chnnal" name="chnnal" value=""/>
<input type="hidden" id="bussines" name="bussines" value=""/>
<input type="hidden" id="provider" name="provider" value=""/>
<input type="hidden" id="level" name="level" value=""/>
<input type="hidden" id="province" name="province" value=""/>
<input type="hidden" id="status" name="status" value=""/>
<input type="hidden" id="code" name="code" value=""/>
-->
<input type="hidden" id="xcdWarningJsonId" value='${xcdWarningInfoJson}'>
<input type="hidden" id="checkRelXcdJson" value="">
......@@ -765,10 +729,12 @@ th{
}
ids.splice(0,ids.length);
if (ids.length > 0) {
$("#preview").attr("disabled", false);
$("#create").attr("disabled", false);
$("#closeButton").attr("disabled", false);
$("#confirmButton").attr("disabled", false);
} else {
$("#preview").attr("disabled", true);
$("#create").attr("disabled", true);
$("#closeButton").attr("disabled", true);
$("#confirmButton").attr("disabled", true);
......@@ -1082,16 +1048,15 @@ th{
//链接至告警明细相关信息页面
function openDialog(i) {
console.log(i)
var data = JSON.parse($('#xcdWarningJsonId').val())[i];
$.dialog({
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>"//告警明细，参数从外部传入
+ "<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
+ "<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(){
......@@ -1099,9 +1064,7 @@ th{
$(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继续查找协查单并输出
$.ajax({
type : 'GET',
contentType : 'application/json',
......@@ -1130,6 +1093,122 @@ th{
}
});
}
function batchOpenDialog(ids) {
if(ids.length>10){
$.alert("批量结果预览最多展示10条数据");
return
}
var data = JSON.parse($('#xcdWarningJsonId').val());
if(typeof ids === "number"){
ids = [data[ids].warningId]
}
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-body'>"+
" <table class='table table-vertical'>";
ids.forEach(function (t) {
data.forEach(function (t1) {
if(t1.warningId === t){
content= content+"<tr><td>";
content = content +"<table class='table table-vertical'>" +
" <tr>" +
" <td>告警标题</td>" +
" <td colspan='5'>"+getCol(t1,'warningTitle')+"</td>" +
" <td> 告警ID</td>" +
" <td>"+getCol(t1,'warningId')+"</td>" +
" </tr>" +
" <tr>" +
" <td width='10%'>省份</td>" +
" <td>"+getCol(t1,'provinceName')+"</td>" +
" <td width='10%'>数据来源</td>" +
" <td>"+getCol(t1,'dataSourceName')+"</td>" +
" <td width='10%'>业务</td>" +
" <td>"+getCol(t1,'businessName')+"</td>" +
" <td width='10%'>渠道</td>" +
" <td>"+getCol(t1,'channelName')+"</td>" +
" </tr>" +
" <tr>" +
" <td>指标编码</td>" +
" <td>"+getCol(t1,'kpiCode')+"</td>" +
" <td>指标名称</td>" +
" <td>"+getCol(t1,'kpiName')+"</td>" +
" <td>相关集成商</td>" +
" <td>"+getCol(t1,'providerName')+"</td>" +
" <td>告警级别</td>" +
" <td>"+getCol(t1,'importanceLevelName')+"</td>" +
" </tr>" +
" <tr>" +
" <td>配置项编码</td>" +
" <td>"+getCol(t1,'ciCode')+"</td>" +
" <td>配置项名称</td>" +
" <td>"+getCol(t1,'ciName')+"</td>" +
" <td>关闭类型</td>" +
" <td>"+getCol(t1,'closestatus')+"</td>" +
" <td>告警状态</td>" +
" <td>"+getCol(t1,'warningstatus')+"</td>" +
" </tr>" +
" <tr>" +
" <td>发生时间</td>" +
" <td>"+((t1['occurTime']!=null)?df.format(new Date(t1['occurTime'])):"")+"</td>" +
" <td>结束时间</td>" +
" <td>"+((t1['closeTime']!=null)?df.format(new Date(t1['closeTime'])):"")+"</td>" +
" <td>协查单号</td>" +
" <td>"+getCol(t1,'workingOrderCode')+"</td>" +
" <td>故障单号</td>" +
" <td>"+getCol(t1,'relevantFailureId')+"</td>" +
" </tr>" +
" <tr>" +
" <td>模型名称</td>" +
" <td>"+getCol(t1,'dataModelName')+"</td>" +
" <td width='10%'>模型类型</td>" +
" <td>"+getCol(t1,'dataModelTypeName')+"</td>" +
" <td width='10%'>告警来源</td>" +
" <td>"+getCol(t1,'warningSourceName')+"</td>" +
" <td>告警类型</td>" +
" <td>"+getCol(t1,'riskEarlyWarningTypeName')+"</td>" +
" </tr>" +
" <tr>" +
" <td>告警描述</td>" +
" <td colspan='7'><input id='alarmMsg' type='text' class='form-control'></td>" +
" </tr>" +
" <tr>" +
" <td colspan='8' align='center'>图表展示</td>" +
" </tr>" +
" <tr>" +
" <td colspan='8'>" +
" <div class=''>" +
" <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}" +"'>" +
" </iframe>" +
" </div>" +
" </td>" +
" </tr>" +
"</table>";
<%--" <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}" +"'>" +--%>
content= content+"</td></tr><tr><td><br></td></tr>";
}
})
})
content = content+"</table></div></div></div>";
$.dialog({
title:'告警明细相关信息页面 告警ID:'+ids,
content:content,
lock: true
});
}
//end change by eric 2014-08-10 18:50
</script>
</body>
......
src/main/webapp/static/js/xcdWarningTable.js
View file @ 828413de
......@@ -261,7 +261,6 @@ table_pagging.prototype = {
}
}
},
// 创建table的数据区域
createTableBodyTd : function() {
this.clearSearchTable();
......@@ -315,43 +314,8 @@ table_pagging.prototype = {
}
//add by eric 2014-04-29 21:42 由预警和隐患列表链接到告警明细相关页面
if(k==1){
// tdContext= "<a target='_blank' href='/CmszMonitorAnalysis/MonitorOperation/WarnAnalysisDetail?WarningID="+this.getData(this.objectlist[i],this.header[k][1])+"'>"+ tdContext+"</a>";
/* change by eric 2014-08-10 18:53
//add by Eric 2014-05-04 14:58 start
tdContext="<a href=\"javascript:;\" onclick=\"openDialog('"+this.getData(this.objectlist[i],this.header[k][1])+"',"
+ this.getData(this.objectlist[i],"warningSourceId")+","
+ this.getData(this.objectlist[i],"dataSourceId")+","
+ this.getData(this.objectlist[i],"channelId")+","
+ this.getData(this.objectlist[i],"businessId")+","
+ this.getData(this.objectlist[i],"kpiId")+","
+ this.getData(this.objectlist[i],"configItemId")+","
+ this.getData(this.objectlist[i],"provinceId")+",'"
+ ((this.getData(this.objectlist[i],"warningTitle")!=null&&this.getData(this.objectlist[i],"warningTitle")!='')?this.getData(this.objectlist[i],"warningTitle"):"")+"','"
+ ((this.getData(this.objectlist[i],"provinceName")!=null&&this.getData(this.objectlist[i],"provinceName")!='')?this.getData(this.objectlist[i],"provinceName"):"")+"','"
+ ((this.getData(this.objectlist[i],"channelName")!=null&&this.getData(this.objectlist[i],"channelName")!='')?this.getData(this.objectlist[i],"channelName"):"")+"','"
+ ((this.getData(this.objectlist[i],"businessName")!=null&&this.getData(this.objectlist[i],"businessName")!='')?this.getData(this.objectlist[i],"businessName"):"")+"','"
+ ((this.getData(this.objectlist[i],"dataSourceName")!=null&&this.getData(this.objectlist[i],"dataSourceName")!='')?this.getData(this.objectlist[i],"dataSourceName"):"")+"','"
+ ((this.getData(this.objectlist[i],"warningSourceName")!=null&&this.getData(this.objectlist[i],"warningSourceName")!='')?this.getData(this.objectlist[i],"warningSourceName"):"")+"','"
+ ((this.getData(this.objectlist[i],"kpiCode").replace(/\"/g,"")!=null&&this.getData(this.objectlist[i],"kpiCode").replace(/\"/g,"")!='')?this.getData(this.objectlist[i],"kpiCode").replace(/\"/g,""):"")+"','" //去掉其中的双引号
+ ((this.getData(this.objectlist[i],"kpiName").replace(/\"/g,"")!=null&&this.getData(this.objectlist[i],"kpiName").replace(/\"/g,"")!='')?this.getData(this.objectlist[i],"kpiName").replace(/\"/g,""):"")+"','"
+ ((this.getData(this.objectlist[i],"ciCode")!=null&&this.getData(this.objectlist[i],"ciCode")!='')?this.getData(this.objectlist[i],"ciCode"):"")+"','"
+ ((this.getData(this.objectlist[i],"ciName")!=null&&this.getData(this.objectlist[i],"ciName")!='')?this.getData(this.objectlist[i],"ciName"):"")+"','"
+ ((this.getData(this.objectlist[i],"providerName")!=null&&this.getData(this.objectlist[i],"providerName")!='')?this.getData(this.objectlist[i],"providerName"):"")+"','"
+ ((this.getData(this.objectlist[i],"importanceLevelName")!=null&&this.getData(this.objectlist[i],"importanceLevelName")!='')?this.getData(this.objectlist[i],"importanceLevelName"):"")+"','"
+ ((this.getData(this.objectlist[i],"occurTime")!=null&&this.getData(this.objectlist[i],"occurTime")!='')?df.format(new Date(this.getData(this.objectlist[i],"occurTime"))):"")+"','"
+ ((this.getData(this.objectlist[i],"closeTime")!=null&&this.getData(this.objectlist[i],"closeTime")!='')?df.format(new Date(this.getData(this.objectlist[i],"closeTime"))):"")+"','"
+ ((this.getData(this.objectlist[i],"workingOrderCode")!=null&&this.getData(this.objectlist[i],"workingOrderCode")!='')?this.getData(this.objectlist[i],"workingOrderCode"):"")+"','"
+ ((this.getData(this.objectlist[i],"relevantFailureId")!=null&&this.getData(this.objectlist[i],"relevantFailureId")!='')?this.getData(this.objectlist[i],"relevantFailureId"):"")+"','"
+ ((this.getData(this.objectlist[i],"riskEarlyWarningTypeId")!=null&&this.getData(this.objectlist[i],"riskEarlyWarningTypeId")!='')?this.getData(this.objectlist[i],"riskEarlyWarningTypeId"):"")+"','"
+ ((this.getData(this.objectlist[i],"dataModelName")!=null&&this.getData(this.objectlist[i],"dataModelName")!='')?this.getData(this.objectlist[i],"dataModelName"):"")+"','"
+ ((this.getData(this.objectlist[i],"status")!=null&&this.getData(this.objectlist[i],"status")!='')?this.getData(this.objectlist[i],"status"):"")+"','"
+ ((this.getData(this.objectlist[i],"type")!=null&&this.getData(this.objectlist[i],"type")!='')?this.getData(this.objectlist[i],"type"):"")+"'"
+")\" alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
//add by Eric 2014-05-04 14:58 end
end change by eric 2014-08-10 18:54 */
tdContext="<a href=\"javascript:;\" onclick=\"openDialog("+i
+")\" alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
tdContext="<a href='javascript:;' onclick='batchOpenDialog("+i
+")' alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
}
if(k==11){
......@@ -589,7 +553,6 @@ function checkChoose(clickObj){
$("#ckAll").attr("checked",false);
var obj = eval('(' + jsonData + ')');
if(clickObj.checked){//选中
ids.push(obj[clickObj.nextSibling.innerHTML].warningId);
}else{//未选中
var index=-1;
......@@ -604,15 +567,17 @@ function checkChoose(clickObj){
ids.splice(index, 1);
}
}
// alert(ids.join(","));///////////////////////////////////////////////////////////////////////////////////////////
// alert(ids.join(","));///////////////////////////////////////////////////////////////////////////////////////////
// 无复选框被选中时,生成协查单按钮，删除按钮，确认按钮都不可用
if (ids.length > 0) {
$("#preview").attr("disabled", false);
$("#create").attr("disabled", false);
$("#closeButton").attr("disabled", false);
$("#confirmButton").attr("disabled", false);
} else {
$("#preview").attr("disabled", true);
$("#create").attr("disabled", true);
$("#closeButton").attr("disabled", true);
$("#confirmButton").attr("disabled", true);
......@@ -657,10 +622,12 @@ function checkAll(){
}
// 无复选框被选中时,生成协查单按钮，删除按钮，确认按钮都不可用
if (ids.length > 0) {
$("#preview").attr("disabled", false);
$("#create").attr("disabled", false);
$("#closeButton").attr("disabled", false);
$("#confirmButton").attr("disabled", false);
} else {
$("#preview").attr("disabled", true);
$("#create").attr("disabled", true);
$("#closeButton").attr("disabled", true);
$("#confirmButton").attr("disabled", true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment