Skip to content

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

Merge branch 'master' of https://git.zorkdata.com/cuiyixiong/event-analysis 

# Conflicts:
#	templates/event_analysis/error_alarm.html
parents 16f4706f b9670ad7
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 161 deletions
.idea/workspace.xml
View file @ e17a963c
......@@ -2,9 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e2fa75d2-8115-4ed7-953d-380d706efa7c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/event_analysis/views.py" 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" />
</list>
......@@ -101,26 +98,26 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="html" value="692" />
<entry key="py" value="1951" />
<entry key="html" value="751" />
<entry key="py" value="1952" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="HTML" value="692" />
<entry key="Python" value="1951" />
<entry key="HTML" value="751" />
<entry key="Python" value="1952" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="html" value="12" />
<entry key="html" value="14" />
<entry key="py" value="17" />
<entry key="txt" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="HTML" value="12" />
<entry key="HTML" value="14" />
<entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="17" />
</counts>
......@@ -132,8 +129,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/event_analysis/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4368">
<caret line="2201" column="57" selection-start-line="2201" selection-start-column="57" selection-end-line="2201" selection-end-column="57" />
<state relative-caret-position="659">
<caret line="2263" selection-start-line="2263" selection-end-line="2263" />
<folding>
<element signature="e#17#28#0" expanded="true" />
<element signature="e#1264#5973#0" />
......@@ -159,28 +156,22 @@
<element signature="e#91243#92120#0" />
<element signature="e#92158#93010#0" />
<element signature="e#93048#93469#0" />
<marker date="1588935050579" expanded="true" signature="938:1219" ph="..." />
<marker date="1588935050579" expanded="true" signature="1141:1219" ph="..." />
<marker date="1588935050579" expanded="true" signature="92153:98309" ph="..." />
<marker date="1588935050579" expanded="true" signature="93043:98309" ph="..." />
<marker date="1588935050579" expanded="true" signature="93498:96605" ph="..." />
<marker date="1588935050579" expanded="true" signature="96629:98309" ph="..." />
<marker date="1588935050579" expanded="true" signature="96664:96949" ph="..." />
<marker date="1588935050579" expanded="true" signature="96975:98309" ph="..." />
<element signature="e#93503#96602#0" />
<element signature="e#96669#96946#0" />
<element signature="e#98339#109543#0" />
<marker date="1588990134422" expanded="true" signature="938:1219" ph="..." />
<marker date="1588990134422" expanded="true" signature="1141:1219" ph="..." />
<marker date="1588990134422" expanded="true" signature="92153:98310" ph="..." />
<marker date="1588990134422" expanded="true" signature="93043:98310" ph="..." />
<marker date="1588990134422" expanded="true" signature="93498:96605" ph="..." />
<marker date="1588990134422" expanded="true" signature="96629:98310" ph="..." />
<marker date="1588990134422" expanded="true" signature="96664:96950" ph="..." />
<marker date="1588990134422" expanded="true" signature="96976:98310" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/alarm_edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18824">
<caret line="724" column="26" selection-start-line="724" selection-start-column="26" selection-end-line="724" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/event_analysis/urls.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -191,18 +182,9 @@
</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="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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<state relative-caret-position="265">
<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" />
......@@ -221,11 +203,24 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<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 relative-caret-position="237">
<caret line="25" column="36" lean-forward="true" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
<folding>
<element signature="n#style#0;n#span#0;n#el-col#0;n#el-row#0;n#el-form-item#0;n#el-form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#el-table#0;n#template#0;n#div#0;n#el-row#0;n#el-dialog#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/event_edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="491" column="82" lean-forward="true" selection-start-line="488" selection-start-column="64" selection-end-line="491" selection-end-column="82" />
</state>
</provider>
</entry>
......@@ -242,19 +237,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>formLine</find>
<find>number</find>
<find>hapTime</find>
<find>req</find>
<find>getTridList</find>
<find>chooseMachine</find>
<find>getmoduleTree</find>
<find>renderContent</find>
<find>submit</find>
<find>getAlarmTitle</find>
<find>受影响系统</find>
<find>monitor_info</find>
<find>pophide</find>
<find>returnn</find>
<find>event_number</find>
<find>assignee</find>
......@@ -270,8 +252,21 @@
<find>delAlrm</find>
<find>deleteState</find>
<find>type</find>
<find>sureDelete</find>
<find>getAlarmList</find>
<find>sureDelete</find>
<find>createNewTask</find>
<find>batchNewVisible</find>
<find>alarmTypeOp</find>
<find>keyAyy</find>
<find>alarmType</find>
<find>keyAr</find>
<find>search</find>
<find>failure_analysis</find>
<find>alarm_type</find>
<find>查询</find>
<find>searchAlarm</find>
<find>批量</find>
<find>gridData</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -311,14 +306,14 @@
<option value="E:/py/python基础/杂项/练习.py" />
<option value="$PROJECT_DIR$/conf/settings_development.py" />
<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/alarm_count.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$/templates/event_analysis/error_alarm.html" />
<option value="$PROJECT_DIR$/event_analysis/views.py" />
<option value="$PROJECT_DIR$/event_analysis/models.py" />
<option value="$PROJECT_DIR$/event_analysis/views.py" />
<option value="$PROJECT_DIR$/templates/event_analysis/event_edit.html" />
<option value="$PROJECT_DIR$/templates/event_analysis/error_alarm.html" />
</list>
</option>
</component>
......@@ -329,8 +324,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-5" />
<option name="y" value="15" />
<option name="x" value="30" />
<option name="y" value="136" />
<option name="width" value="1920" />
<option name="height" value="905" />
</component>
......@@ -715,10 +710,10 @@
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32962447" />
<window_info anchor="bottom" id="Debug" order="2" weight="0.2393539" />
<window_info anchor="bottom" id="Debug" order="2" weight="0.39353892" />
<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="Run" order="5" sideWeight="0.49928367" weight="0.2393539" />
<window_info anchor="bottom" id="Run" order="5" sideWeight="0.49928367" weight="0.28487518" />
<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="Version Control" order="8" />
......@@ -767,17 +762,17 @@
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2482</line>
<line>2483</line>
<option name="timeStamp" value="86" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2402</line>
<line>2403</line>
<option name="timeStamp" value="87" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2471</line>
<line>2472</line>
<option name="timeStamp" value="88" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
......@@ -785,21 +780,11 @@
<line>1710</line>
<option name="timeStamp" value="90" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2261</line>
<option name="timeStamp" value="106" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2219</line>
<option name="timeStamp" value="108" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2285</line>
<option name="timeStamp" value="109" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/event_analysis/views.py</url>
<line>2246</line>
......@@ -838,7 +823,6 @@
</expressions>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/event_analysis/test_crontab.py" />
<entry file="file://$PROJECT_DIR$/src/frmework/hpd_result.txt" />
<entry file="file://$PROJECT_DIR$/src/frmework/requirements.txt" />
<entry file="file://$PROJECT_DIR$/src/requirements.txt" />
......@@ -1004,6 +988,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4611">
<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>
</provider>
</entry>
......@@ -1042,17 +1029,58 @@
</state>
</provider>
</entry>
<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">
<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">
<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>
<entry file="file://$PROJECT_DIR$/event_analysis/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<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>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/error_alarm.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="517" column="12" lean-forward="true" selection-start-line="517" selection-start-column="12" selection-end-line="521" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/alarm_edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="70">
<caret line="971" column="24" selection-start-line="971" selection-start-column="24" selection-end-line="984" selection-end-column="29" />
<state relative-caret-position="1007">
<caret line="197" column="12" selection-start-line="197" selection-start-column="12" selection-end-line="201" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/event_analysis/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4368">
<caret line="2201" column="57" selection-start-line="2201" selection-start-column="57" selection-end-line="2201" selection-end-column="57" />
<state relative-caret-position="659">
<caret line="2263" selection-start-line="2263" selection-end-line="2263" />
<folding>
<element signature="e#17#28#0" expanded="true" />
<element signature="e#1264#5973#0" />
......@@ -1078,62 +1106,35 @@
<element signature="e#91243#92120#0" />
<element signature="e#92158#93010#0" />
<element signature="e#93048#93469#0" />
<marker date="1588935050579" expanded="true" signature="938:1219" ph="..." />
<marker date="1588935050579" expanded="true" signature="1141:1219" ph="..." />
<marker date="1588935050579" expanded="true" signature="92153:98309" ph="..." />
<marker date="1588935050579" expanded="true" signature="93043:98309" ph="..." />
<marker date="1588935050579" expanded="true" signature="93498:96605" ph="..." />
<marker date="1588935050579" expanded="true" signature="96629:98309" ph="..." />
<marker date="1588935050579" expanded="true" signature="96664:96949" ph="..." />
<marker date="1588935050579" expanded="true" signature="96975:98309" ph="..." />
<element signature="e#93503#96602#0" />
<element signature="e#96669#96946#0" />
<element signature="e#98339#109543#0" />
<marker date="1588990134422" expanded="true" signature="938:1219" ph="..." />
<marker date="1588990134422" expanded="true" signature="1141:1219" ph="..." />
<marker date="1588990134422" expanded="true" signature="92153:98310" ph="..." />
<marker date="1588990134422" expanded="true" signature="93043:98310" ph="..." />
<marker date="1588990134422" expanded="true" signature="93498:96605" ph="..." />
<marker date="1588990134422" expanded="true" signature="96629:98310" ph="..." />
<marker date="1588990134422" expanded="true" signature="96664:96950" ph="..." />
<marker date="1588990134422" expanded="true" signature="96976:98310" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/event_analysis/alarm_edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18824">
<caret line="724" column="26" selection-start-line="724" selection-start-column="26" selection-end-line="724" selection-end-column="26" />
</state>
</provider>
</entry>
<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">
<entry file="file://$PROJECT_DIR$/templates/event_analysis/event_edit.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 relative-caret-position="263">
<caret line="491" column="82" lean-forward="true" selection-start-line="488" selection-start-column="64" selection-end-line="491" selection-end-column="82" />
</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" />
<state relative-caret-position="237">
<caret line="25" column="36" lean-forward="true" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
<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="..." />
<element signature="n#style#0;n#span#0;n#el-col#0;n#el-row#0;n#el-form-item#0;n#el-form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#el-table#0;n#template#0;n#div#0;n#el-row#0;n#el-dialog#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......
templates/event_analysis/error_alarm.html
View file @ e17a963c
<%inherit file="/base_index.html"/>
<%block name='content'>
<style>
.colorSucStyle {
color: #44b549;
}
.colorErrStyle {
color: orangered;
}
.lable_color {
color: rgba(0, 0, 0, 0.70);
}
</style>
<div class="tab-content mb20">
<div id="scanTask">
<div class="scanTask" v-cloak>
<div id="errorAlarm">
<div class="errorAlarm" v-cloak>
<div class="tab-pane fade active in">
<div class="panel panel-default table7_demo king-table7-demo3" style="border:none;">
<div class="panel-body">
......@@ -30,7 +19,8 @@
@click="createNewTask()">通过告警新建
</el-button>
<el-button type="primary" size="medium"
@click="createNewAlarm()" style=" float:right;margin-right:12px">新建
@click="createNewAlarm()" style=" float:right;margin-right:12px">
新建
</el-button>
</el-col>
</el-row>
......@@ -120,18 +110,22 @@
align="left"></el-table-column>
<el-table-column prop="alarm_summary" label="故障预警摘要" header-align="center" align="left"
show-overflow-tooltip></el-table-column>
<el-table-column width="130" prop="alarm_level" label="预警级别" align="center"></el-table-column>
<el-table-column width="130" prop="alarm_level" label="预警级别"
align="center"></el-table-column>
<el-table-column width="130" prop="alarm_system" label="预警系统"
align="center"></el-table-column>
<el-table-column width="130" prop="user" label="处理人"
align="center"></el-table-column>
<el-table-column width="130" label="操作" align="center">
<template slot-scope="scope">
<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 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 v-if="user==scope.row.user" @click="delAlarm(scope.row)" type="text" size="small">删除
<el-button v-if="user==scope.row.user" @click="delAlarm(scope.row)" type="text"
size="small">删除
</el-button>
</template>
</el-table-column>
......@@ -332,7 +326,7 @@
};
var vm = new Vue({
el: "#scanTask",
el: "#errorAlarm",
data() {
return {
dateoutflag: false,
......@@ -398,6 +392,7 @@
this.systemList = res
})
},
<<<<<<< HEAD
searchAlarm(){
if (this.formLine.failure_analysis.alarm_type && this.formLine.failure_analysis.start_time
&& this.formLine.failure_analysis.end_time) {
......@@ -448,7 +443,26 @@
type: 'info',
message: '已取消删除'
});
=======
createNewAlarm() {
window.location.href = "${SITE_URL}alarm_edit"
},
delAlarm(row) {
let vm = this
vm.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
cancelButtonText: '取消',
confirmButtonText: '确定',
type: 'warning'
}).then(() => {
let id = row.alarm_number;
this.sureDelete(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
>>>>>>> b9670ad79ebce4d627128543ad1aa9ae0d773d17
});
});
},
//查询
searchList() {
......@@ -537,19 +551,19 @@
let vm = this;
let data = {alarm_number: id};
axios.post('${SITE_URL}del_alarm/', data).then(res => {
if(res.code==0){
this.$message({
type: 'success',
message: res.message
});
this.getAlarmList()
}else{
this.$message({
type: 'error',
message: res.message
});
this.dellabelshow = false
}
if (res.code == 0) {
this.$message({
type: 'success',
message: res.message
});
this.getAlarmList()
} else {
this.$message({
type: 'error',
message: res.message
});
this.dellabelshow = false
}
}, err => {
vm.$message({
type: 'error',
......
templates/event_analysis/event_edit.html
View file @ e17a963c
......@@ -30,8 +30,8 @@
</style>
<div class="tab-content mb20">
<div id="scanTask">
<div class="scanTask" v-cloak>
<div id="eventEdit">
<div class="eventEdit" v-cloak>
<div style=" padding-left: 20px;" >
<el-form label-width="90px" :model="formLine" >
<div class="bk-panel" style="padding-bottom: 10px; padding-top: 25px">
......@@ -729,7 +729,7 @@ var unique= function (array) {
}
var vm = new Vue({
el: "#scanTask",
el: "#eventEdit",
data() {
return {
taskData2: {
......
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