monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 81424b38f8674ee4f78eb6d6d6fc8349d6918aff 2 parents 0bd40fd6 68738631

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

告警驳回关键字不能输入



See merge request !534
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -146,10 +146,10 @@ @@ -146,10 +146,10 @@
146 </div> 146 </div>
147 </div> 147 </div>
148 <div class="alarmsClearTag" v-if="repositoryInto && (!isExamine || status==0 || status==3) "> 148 <div class="alarmsClearTag" v-if="repositoryInto && (!isExamine || status==0 || status==3) ">
149 - <div class="tag-keyword" v-if="isExamine && status!=0 && approverName==loginName"> 149 + <div class="tag-keyword" v-if="isExamine && status == 2 && approverName==loginName">
150 关键字：<span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span> 150 关键字：<span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span>
151 </div> 151 </div>
152 - <div class="tag-keyword" v-if="!isExamine || status==0"> 152 + <div class="tag-keyword" v-if="!isExamine || status==0 || status==3">
153 关键字： 153 关键字：
154 <el-tag 154 <el-tag
155 v-for="tag in dynamicTags" 155 v-for="tag in dynamicTags"