Skip to content

E
event-analysis
Commit 412cc534 authored by Kerwin_Cui's avatar Kerwin_Cui
Browse files
Options

更新

parent f06f1f60
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 175 deletions
.idea/workspace.xml
View file @ 412cc534
...@@ -6,10 +6,7 @@ ...@@ -6,10 +6,7 @@
<change beforePath="$PROJECT_DIR$/event_analysis/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/event_analysis/models.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/event_analysis/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/event_analysis/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/event_analysis/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/event_analysis/urls.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/event_analysis/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/event_analysis/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/event_analysis/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/event_analysis/views.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/event_analysis/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/event_analysis/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/event_analysis/alarm_count.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/event_analysis/alarm_count.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/event_analysis/alarm_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/event_analysis/alarm_edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/event_analysis/error_alarm.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/event_analysis/error_alarm.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/templates/event_analysis/error_alarm.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/event_analysis/error_alarm.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -93,38 +90,39 @@ ...@@ -93,38 +90,39 @@
<session id="-1508577494"> <session id="-1508577494">
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
<counts> <counts>
<entry key="project.closed" value="3" /> <entry key="project.closed" value="4" />
<entry key="project.open.time.30" value="1" /> <entry key="project.open.time.30" value="1" />
<entry key="project.open.time.37" value="1" /> <entry key="project.open.time.37" value="1" />
<entry key="project.open.time.39" value="1" />
<entry key="project.open.time.4" value="1" /> <entry key="project.open.time.4" value="1" />
<entry key="project.open.time.41" value="1" /> <entry key="project.open.time.41" value="1" />
<entry key="project.opened" value="4" /> <entry key="project.opened" value="5" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="html" value="655" /> <entry key="html" value="692" />
<entry key="py" value="1851" /> <entry key="py" value="1951" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="HTML" value="655" /> <entry key="HTML" value="692" />
<entry key="Python" value="1851" /> <entry key="Python" value="1951" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="html" value="11" /> <entry key="html" value="12" />
<entry key="py" value="16" /> <entry key="py" value="17" />
<entry key="txt" value="1" /> <entry key="txt" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="HTML" value="11" /> <entry key="HTML" value="12" />
<entry key="PLAIN_TEXT" value="1" /> <entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="16" /> <entry key="Python" value="17" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -134,10 +132,11 @@ ...@@ -134,10 +132,11 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/event_analysis/views.py"> <entry file="file://$PROJECT_DIR$/event_analysis/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179"> <state relative-caret-position="4368">
<caret line="2241" selection-start-line="2241" selection-end-line="2241" /> <caret line="2201" column="57" selection-start-line="2201" selection-start-column="57" selection-end-line="2201" selection-end-column="57" />
<folding> <folding>
<element signature="e#17#28#0" expanded="true" /> <element signature="e#17#28#0" expanded="true" />
<element signature="e#1264#5973#0" />
<element signature="e#6016#6480#0" /> <element signature="e#6016#6480#0" />
<element signature="e#6519#23009#0" /> <element signature="e#6519#23009#0" />
<element signature="e#23053#38784#0" /> <element signature="e#23053#38784#0" />
...@@ -160,42 +159,51 @@ ...@@ -160,42 +159,51 @@
<element signature="e#91243#92120#0" /> <element signature="e#91243#92120#0" />
<element signature="e#92158#93010#0" /> <element signature="e#92158#93010#0" />
<element signature="e#93048#93469#0" /> <element signature="e#93048#93469#0" />
<element signature="e#94816#106020#0" /> <marker date="1588935050579" expanded="true" signature="938:1219" ph="..." />
<marker date="1588926879017" expanded="true" signature="938:1219" ph="..." /> <marker date="1588935050579" expanded="true" signature="1141:1219" ph="..." />
<marker date="1588926879017" expanded="true" signature="1141:1219" ph="..." /> <marker date="1588935050579" expanded="true" signature="92153:98309" ph="..." />
<marker date="1588926879017" expanded="true" signature="92153:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="93043:98309" ph="..." />
<marker date="1588926879017" expanded="true" signature="93043:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="93498:96605" ph="..." />
<marker date="1588926879017" expanded="true" signature="93498:96463" ph="..." /> <marker date="1588935050579" expanded="true" signature="96629:98309" ph="..." />
<marker date="1588926879017" expanded="true" signature="96487:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="96664:96949" ph="..." />
<marker date="1588926879017" expanded="true" signature="96524:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="96975:98309" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/alarm_edit.html"> <entry file="file://$PROJECT_DIR$/templates/event_analysis/alarm_edit.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199"> <state relative-caret-position="18824">
<caret line="724" column="26" lean-forward="true" selection-start-line="724" selection-start-column="26" selection-end-line="724" selection-end-column="26" /> <caret line="724" column="26" selection-start-line="724" selection-start-column="26" selection-end-line="724" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/event_edit.html"> <entry file="file://$PROJECT_DIR$/event_analysis/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1214"> <state relative-caret-position="910">
<caret line="919" column="29" selection-start-line="919" selection-start-column="25" selection-end-line="919" selection-end-column="29" /> <caret line="36" column="34" selection-start-line="36" selection-start-column="34" selection-end-line="36" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12376">
<caret line="476" column="20" selection-start-line="476" selection-start-column="20" selection-end-line="488" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/event_analysis/models.py"> <entry file="file://$PROJECT_DIR$/event_analysis/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291"> <state relative-caret-position="31">
<caret line="278" column="21" selection-start-line="278" selection-start-column="4" selection-end-line="278" selection-end-column="21" /> <caret line="277" column="65" selection-start-line="277" selection-start-column="65" selection-end-line="277" selection-end-column="65" />
<folding> <folding>
<element signature="e#115#4658#0" /> <element signature="e#115#4658#0" />
<element signature="e#4708#5775#0" /> <element signature="e#4708#5775#0" />
...@@ -207,7 +215,7 @@ ...@@ -207,7 +215,7 @@
<element signature="e#9805#10332#0" /> <element signature="e#9805#10332#0" />
<element signature="e#10392#10960#0" /> <element signature="e#10392#10960#0" />
<element signature="e#10992#11436#0" /> <element signature="e#10992#11436#0" />
<marker date="1588925563979" expanded="true" signature="12238:12239" ph="..." /> <marker date="1588935096833" expanded="true" signature="12238:12239" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -216,17 +224,8 @@ ...@@ -216,17 +224,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/error_alarm.html"> <entry file="file://$PROJECT_DIR$/templates/event_analysis/error_alarm.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309"> <state relative-caret-position="10504">
<caret line="125" column="67" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="67" /> <caret line="404" column="35" selection-start-line="404" selection-start-column="35" selection-end-line="404" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-159">
<caret line="148" column="57" selection-start-line="148" selection-start-column="49" selection-end-line="148" selection-end-column="57" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -243,13 +242,6 @@ ...@@ -243,13 +242,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>故障预警</find>
<find>priority</find>
<find>getLabel</find>
<find>dellabel</find>
<find>alarmList</find>
<find>getSubDate</find>
<find>formInline</find>
<find>formLine</find> <find>formLine</find>
<find>number</find> <find>number</find>
<find>hapTime</find> <find>hapTime</find>
...@@ -271,8 +263,15 @@ ...@@ -271,8 +263,15 @@
<find>login_person</find> <find>login_person</find>
<find>event_page</find> <find>event_page</find>
<find>pageSize</find> <find>pageSize</find>
<find>setmainuser</find>
<find>taskData</find> <find>taskData</find>
<find>查看</find>
<find>deleteRow</find>
<find>delAlrm</find>
<find>deleteState</find>
<find>type</find> <find>type</find>
<find>sureDelete</find>
<find>getAlarmList</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -314,12 +313,12 @@ ...@@ -314,12 +313,12 @@
<option value="$PROJECT_DIR$/templates/base_index.html" /> <option value="$PROJECT_DIR$/templates/base_index.html" />
<option value="$PROJECT_DIR$/templates/event_analysis/event_edit.html" /> <option value="$PROJECT_DIR$/templates/event_analysis/event_edit.html" />
<option value="$PROJECT_DIR$/templates/event_analysis/alarm_count.html" /> <option value="$PROJECT_DIR$/templates/event_analysis/alarm_count.html" />
<option value="$PROJECT_DIR$/event_analysis/models.py" />
<option value="$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html" /> <option value="$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html" />
<option value="$PROJECT_DIR$/templates/event_analysis/alarm_edit.html" />
<option value="$PROJECT_DIR$/event_analysis/urls.py" /> <option value="$PROJECT_DIR$/event_analysis/urls.py" />
<option value="$PROJECT_DIR$/templates/event_analysis/error_alarm.html" /> <option value="$PROJECT_DIR$/templates/event_analysis/error_alarm.html" />
<option value="$PROJECT_DIR$/event_analysis/views.py" /> <option value="$PROJECT_DIR$/event_analysis/views.py" />
<option value="$PROJECT_DIR$/templates/event_analysis/alarm_edit.html" /> <option value="$PROJECT_DIR$/event_analysis/models.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -329,7 +328,7 @@ ...@@ -329,7 +328,7 @@
<detection-done>true</detection-done> <detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="ProjectFrameBounds" extendedState="7"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-5" /> <option name="x" value="-5" />
<option name="y" value="15" /> <option name="y" value="15" />
<option name="width" value="1920" /> <option name="width" value="1920" />
...@@ -340,7 +339,6 @@ ...@@ -340,7 +339,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -373,6 +371,7 @@ ...@@ -373,6 +371,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -711,15 +710,15 @@ ...@@ -711,15 +710,15 @@
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4966292" visible="true" weight="0.17426273" /> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4966292" visible="true" weight="0.17627347" />
<window_info id="Structure" order="1" sideWeight="0.50337076" side_tool="true" weight="0.15186246" /> <window_info id="Structure" order="1" sideWeight="0.50337076" side_tool="true" weight="0.15186246" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32962447" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32962447" />
<window_info anchor="bottom" id="Debug" order="2" weight="0.4331865" /> <window_info anchor="bottom" id="Debug" order="2" weight="0.2393539" />
<window_info anchor="bottom" id="Cvs" order="3" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="4" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
<window_info active="true" anchor="bottom" id="Run" order="5" sideWeight="0.49928367" visible="true" weight="0.3010279" /> <window_info anchor="bottom" id="Run" order="5" sideWeight="0.49928367" weight="0.2393539" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32962447" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.32962447" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Version Control" order="8" />
...@@ -768,17 +767,17 @@ ...@@ -768,17 +767,17 @@
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url> <url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2462</line> <line>2482</line>
<option name="timeStamp" value="86" /> <option name="timeStamp" value="86" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url> <url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2382</line> <line>2402</line>
<option name="timeStamp" value="87" /> <option name="timeStamp" value="87" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url> <url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2451</line> <line>2471</line>
<option name="timeStamp" value="88" /> <option name="timeStamp" value="88" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
...@@ -788,23 +787,23 @@ ...@@ -788,23 +787,23 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url> <url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2241</line> <line>2261</line>
<option name="timeStamp" value="106" /> <option name="timeStamp" value="106" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url> <url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2158</line> <line>2219</line>
<option name="timeStamp" value="107" /> <option name="timeStamp" value="108" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url> <url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2215</line> <line>2285</line>
<option name="timeStamp" value="108" /> <option name="timeStamp" value="109" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url> <url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2265</line> <line>2246</line>
<option name="timeStamp" value="109" /> <option name="timeStamp" value="110" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
...@@ -1005,9 +1004,6 @@ ...@@ -1005,9 +1004,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4611"> <state relative-caret-position="-4611">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" /> <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="e#1002#1011#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1046,53 +1042,20 @@ ...@@ -1046,53 +1042,20 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/event_analysis/urls.py"> <entry file="file://$PROJECT_DIR$/templates/event_analysis/event_edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="34" column="38" lean-forward="true" selection-start-line="34" selection-start-column="38" selection-end-line="34" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/event_analysis/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<caret line="278" column="21" selection-start-line="278" selection-start-column="4" selection-end-line="278" selection-end-column="21" />
<folding>
<element signature="e#115#4658#0" />
<element signature="e#4708#5775#0" />
<element signature="e#5822#6374#0" />
<element signature="e#6433#7073#0" />
<element signature="e#7114#8126#0" />
<element signature="e#8179#8935#0" />
<element signature="e#8990#9740#0" />
<element signature="e#9805#10332#0" />
<element signature="e#10392#10960#0" />
<element signature="e#10992#11436#0" />
<marker date="1588925563979" expanded="true" signature="12238:12239" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-159">
<caret line="148" column="57" selection-start-line="148" selection-start-column="49" selection-end-line="148" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/error_alarm.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309"> <state relative-caret-position="70">
<caret line="125" column="67" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="67" /> <caret line="971" column="24" selection-start-line="971" selection-start-column="24" selection-end-line="984" selection-end-column="29" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/event_analysis/views.py"> <entry file="file://$PROJECT_DIR$/event_analysis/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179"> <state relative-caret-position="4368">
<caret line="2241" selection-start-line="2241" selection-end-line="2241" /> <caret line="2201" column="57" selection-start-line="2201" selection-start-column="57" selection-end-line="2201" selection-end-column="57" />
<folding> <folding>
<element signature="e#17#28#0" expanded="true" /> <element signature="e#17#28#0" expanded="true" />
<element signature="e#1264#5973#0" />
<element signature="e#6016#6480#0" /> <element signature="e#6016#6480#0" />
<element signature="e#6519#23009#0" /> <element signature="e#6519#23009#0" />
<element signature="e#23053#38784#0" /> <element signature="e#23053#38784#0" />
...@@ -1115,29 +1078,63 @@ ...@@ -1115,29 +1078,63 @@
<element signature="e#91243#92120#0" /> <element signature="e#91243#92120#0" />
<element signature="e#92158#93010#0" /> <element signature="e#92158#93010#0" />
<element signature="e#93048#93469#0" /> <element signature="e#93048#93469#0" />
<element signature="e#94816#106020#0" /> <marker date="1588935050579" expanded="true" signature="938:1219" ph="..." />
<marker date="1588926879017" expanded="true" signature="938:1219" ph="..." /> <marker date="1588935050579" expanded="true" signature="1141:1219" ph="..." />
<marker date="1588926879017" expanded="true" signature="1141:1219" ph="..." /> <marker date="1588935050579" expanded="true" signature="92153:98309" ph="..." />
<marker date="1588926879017" expanded="true" signature="92153:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="93043:98309" ph="..." />
<marker date="1588926879017" expanded="true" signature="93043:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="93498:96605" ph="..." />
<marker date="1588926879017" expanded="true" signature="93498:96463" ph="..." /> <marker date="1588935050579" expanded="true" signature="96629:98309" ph="..." />
<marker date="1588926879017" expanded="true" signature="96487:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="96664:96949" ph="..." />
<marker date="1588926879017" expanded="true" signature="96524:97858" ph="..." /> <marker date="1588935050579" expanded="true" signature="96975:98309" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/event_edit.html"> <entry file="file://$PROJECT_DIR$/templates/event_analysis/alarm_edit.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1214"> <state relative-caret-position="18824">
<caret line="919" column="29" selection-start-line="919" selection-start-column="25" selection-end-line="919" selection-end-column="29" /> <caret line="724" column="26" selection-start-line="724" selection-start-column="26" selection-end-line="724" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/alarm_edit.html"> <entry file="file://$PROJECT_DIR$/event_analysis/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="910">
<caret line="36" column="34" selection-start-line="36" selection-start-column="34" selection-end-line="36" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/eventmanagement_display.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199"> <state relative-caret-position="12376">
<caret line="724" column="26" lean-forward="true" selection-start-line="724" selection-start-column="26" selection-end-line="724" selection-end-column="26" /> <caret line="476" column="20" selection-start-line="476" selection-start-column="20" selection-end-line="488" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/error_alarm.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10504">
<caret line="404" column="35" selection-start-line="404" selection-start-column="35" selection-end-line="404" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/event_analysis/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<caret line="277" column="65" selection-start-line="277" selection-start-column="65" selection-end-line="277" selection-end-column="65" />
<folding>
<element signature="e#115#4658#0" />
<element signature="e#4708#5775#0" />
<element signature="e#5822#6374#0" />
<element signature="e#6433#7073#0" />
<element signature="e#7114#8126#0" />
<element signature="e#8179#8935#0" />
<element signature="e#8990#9740#0" />
<element signature="e#9805#10332#0" />
<element signature="e#10392#10960#0" />
<element signature="e#10992#11436#0" />
<marker date="1588935096833" expanded="true" signature="12238:12239" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
event_analysis/models.py
View file @ 412cc534
...@@ -275,7 +275,7 @@ class Error_alarm(models.Model): ...@@ -275,7 +275,7 @@ class Error_alarm(models.Model):
alarm_number = models.CharField(null=True, max_length=100, verbose_name="预警编号") alarm_number = models.CharField(null=True, max_length=100, verbose_name="预警编号")
alarm_summary = models.TextField(null=True, verbose_name="预警摘要") alarm_summary = models.TextField(null=True, verbose_name="预警摘要")
alarm_level = models.CharField(null=True, max_length=100, verbose_name="预警级别") alarm_level = models.CharField(null=True, max_length=100, verbose_name="预警级别")
alarm_system = models.CharField(null=True, max_length=100, verbose_name="预警系统") alarm_system = models.TextField(null=True, verbose_name="预警系统")
alarm_happen_time = models.DateTimeField(null=True, verbose_name="预警发生时间") alarm_happen_time = models.DateTimeField(null=True, verbose_name="预警发生时间")
alarm_recover_time = models.DateTimeField(null=True, verbose_name="预警恢复时间") alarm_recover_time = models.DateTimeField(null=True, verbose_name="预警恢复时间")
if_interpose = models.CharField(null=True, max_length=100, verbose_name="是否需要干预") if_interpose = models.CharField(null=True, max_length=100, verbose_name="是否需要干预")
......
event_analysis/urls.py
View file @ 412cc534
...@@ -34,4 +34,5 @@ urlpatterns = [ ...@@ -34,4 +34,5 @@ urlpatterns = [
url(r'^create_alarm/$', create_alarm), url(r'^create_alarm/$', create_alarm),
url(r'^edit_alarm/$', edit_alarm), url(r'^edit_alarm/$', edit_alarm),
url(r'^search_alarm/$', search_alarm), url(r'^search_alarm/$', search_alarm),
url(r'^del_alarm/$', del_alarm),
] ]
event_analysis/views.py
View file @ 412cc534
...@@ -2198,6 +2198,10 @@ def create_alarm(request): ...@@ -2198,6 +2198,10 @@ def create_alarm(request):
result = client.bk_login.get_user(parse) result = client.bk_login.get_user(parse)
login_person = result['data']['chname'] login_person = result['data']['chname']
if_exit = Error_alarm.objects.filter(alarm_number__contains=alarm_number)
alarm_number = alarm_number+'_'+str(len(if_exit))
error_alarm = Error_alarm.objects.create( error_alarm = Error_alarm.objects.create(
alarm_number = alarm_number, alarm_number = alarm_number,
alarm_summary = alarm_summary, alarm_summary = alarm_summary,
...@@ -2239,6 +2243,22 @@ def create_alarm(request): ...@@ -2239,6 +2243,22 @@ def create_alarm(request):
def edit_alarm(request): def edit_alarm(request):
pass pass
def del_alarm(request):
try:
id = json.loads(request.body)
a=1
except Exception as e:
return render_json(
{
"result": False,
"code": 1,
"message": u"未知错误:%s" % e,
"data": {}
}
)
def search_alarm(request): def search_alarm(request):
try: try:
req = json.loads(request.body) req = json.loads(request.body)
......
templates/event_analysis/error_alarm.html
View file @ 412cc534
...@@ -127,10 +127,12 @@ ...@@ -127,10 +127,12 @@
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column width="130" label="操作" align="center"> <el-table-column width="130" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="readRow(scope.row)" type="text" size="small">查看 <el-button v-if="user!=scope.row.user" @click="readRow(scope.row)" type="text" size="small">查看
</el-button> </el-button>
<el-button v-if="user==scope.row.user" @click="readRow(scope.row)" type="text" size="small">编辑 <el-button v-if="user==scope.row.user" @click="readRow(scope.row)" type="text" size="small">编辑
</el-button> </el-button>
<el-button v-if="user==scope.row.user" @click="delAlarm(scope.row)" type="text" size="small">删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -395,6 +397,21 @@ ...@@ -395,6 +397,21 @@
createNewAlarm(){ createNewAlarm(){
window.location.href = "${SITE_URL}alarm_edit" window.location.href = "${SITE_URL}alarm_edit"
}, },
delAlarm(){
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let id = row.alarm_number;
this.sureDelete(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
//查询 //查询
searchList() { searchList() {
this.currentPage = 1; this.currentPage = 1;
...@@ -437,13 +454,6 @@ ...@@ -437,13 +454,6 @@
}) })
}, },
//新建模板
createNewTask() {
// window.localStorage.removeItem("event_number")
// window.location.href = "${SITE_URL}event_edit"
this.batchNewVisible = true
},
//编辑模板 //编辑模板
readRow(row) { readRow(row) {
let data = {event_number: row.event_number}; let data = {event_number: row.event_number};
...@@ -453,10 +463,6 @@ ...@@ -453,10 +463,6 @@
}) })
}, },
//同步执行
syncTask() {
window.location.href = "${SITE_URL}sync"
},
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectData[this.currentPage] = []; this.selectData[this.currentPage] = [];
...@@ -489,47 +495,23 @@ ...@@ -489,47 +495,23 @@
}) })
}, },
//删除
deleteRow(row) {
let vm = this;
this.selectContent = row;
if (row.data_src == 1) {
this.$message('当前选中记录为同步数据，不可删除！！！');
return false
}
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let id = row.event_number;
this.sureDelete(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
sureDelete(id) { sureDelete(id) {
let vm = this; let vm = this;
let data = {event_number: id}; let data = {alarm_number: id};
axios.post('${SITE_URL}delete_event/', data).then(res => { axios.post('${SITE_URL}del_alarm/', data).then(res => {
vm.deleteState = res.data.deleteState; if(res.code==0){
console.log(vm.deleteState); this.$message({
if (vm.deleteState == '0') { type: 'success',
vm.$message({ message: res.message
type: 'success', });
message: '删除成功!' this.getAlarmList()
}); }else{
vm.getTaskList() this.$message({
} else { type: 'error',
vm.$message({ message: res.message
type: 'error', });
message: '该事件处理人与目前登录人不符，无法删除!' this.dellabelshow = false
}); }
}
}, err => { }, err => {
vm.$message({ vm.$message({
type: 'error', type: 'error',
......
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