feat:alertMessage 添加remark列 以及搜索添加根据id搜索的功能

This commit is contained in:
zhangyu
2020-10-30 14:09:11 +08:00
parent 3c78ba1ded
commit 61c085aadb
6 changed files with 30 additions and 5 deletions

View File

@@ -71,6 +71,10 @@
<template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template> <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
<template v-else-if="item.prop == 'remark'">
<template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
<span v-else>-</span>
</template>
<span v-else-if="item.prop == 'severity'" class="severity"> <span v-else-if="item.prop == 'severity'" class="severity">
<span v-if="scope.row[item.prop] == 'P1'" class="P1">P1</span> <span v-if="scope.row[item.prop] == 'P1'" class="P1">P1</span>
<!--<i class="nz-icon nz-icon-arrow-up"></i> {{returnSeverityLabel(scope.row[item.prop])}}--> <!--<i class="nz-icon nz-icon-arrow-up"></i> {{returnSeverityLabel(scope.row[item.prop])}}-->
@@ -164,7 +168,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--<弹窗>--> <!--<弹窗>-->
<!--删除弹窗-->
<!--导出--> <!--导出-->
<div class="export-xlsx"> <div class="export-xlsx">
<el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" width="300px" @close="closeDialog" class="nz-dialog"> <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" width="300px" @close="closeDialog" class="nz-dialog">
@@ -178,9 +181,9 @@
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
<!--export--> <!--删除弹窗-->
<div class="export-xlsx"> <div class="export-xlsx">
<el-dialog :visible.sync="deleteBox.show" :title="$t('overall.delete')" :modal-append-to-body='false' :show-close="true" width="300px" @close="closeDialog" class="nz-message"> <el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px" @close="closeDialog" class="nz-message">
<div class="upload-body"> <div class="upload-body">
<el-form ref="remarkForm" :model="deleteBox"> <el-form ref="remarkForm" :model="deleteBox">
<el-form-item :rules="[{required: true, message: this.$t('validate.required'), trigger: 'blur'}]" prop="remark"> <el-form-item :rules="[{required: true, message: this.$t('validate.required'), trigger: 'blur'}]" prop="remark">
@@ -315,6 +318,11 @@
prop: 'description', prop: 'description',
show: true, show: true,
minWidth:200 minWidth:200
},{
label: this.$t('alert.list.remark'),
prop: 'remark',
show: true,
minWidth:200
}, { }, {
label: this.$t('alert.list.state'), label: this.$t('alert.list.state'),
prop: 'state', prop: 'state',

View File

@@ -225,7 +225,14 @@
type: 'select', type: 'select',
label: 'alertMessageState', label: 'alertMessageState',
disabled: false disabled: false
}], },
{
id:26,
name: this.$t('alert.list.id'),
type: 'id',
label: 'id',
disabled: false
}],
}, },
searchLabel: { //搜索参数 searchLabel: { //搜索参数

View File

@@ -768,6 +768,8 @@ const cn = {
expired: "已过期", expired: "已过期",
labels: "标签", labels: "标签",
current: "当前", current: "当前",
remark:'备注',
id:'ID',
}, },
config: { config: {
name: "名称", name: "名称",

View File

@@ -775,6 +775,8 @@ const en = {
expired: 'Expired',//"已过期" expired: 'Expired',//"已过期"
labels: 'Labels', labels: 'Labels',
current: 'Current', current: 'Current',
remark:'Remark',
id:'ID',
}, },
config: { config: {
name: 'Name',//"名称" name: 'Name',//"名称"

View File

@@ -146,7 +146,7 @@
<div v-show="clearSearchShow" class="clear-search" @click="clear_input"> <div v-show="clearSearchShow" class="clear-search" @click="clear_input">
<i class="nz-icon nz-icon-circle-close"></i> <i class="nz-icon nz-icon-circle-close"></i>
</div> </div>
<div :class="input_list?'input_list none':'input_list'" :style="'top:' + selectDom.top" @click="stop_click" id="input_list"> <div :class="input_list?'input_list none':'input_list'" :style="'top:' + selectDom.top" @click="stop_click" id="input_list" v-scroll-bar>
<ul> <ul>
<li v-for="(val,ind) in searchLabelList" @click="select_name(val.name,ind,val.id,val.type,val.label,val.disabled,$event)" :key="ind" :class="{'search-style-ind':searchStyleNum==ind,'is-disabled':val.disabled}"> <li v-for="(val,ind) in searchLabelList" @click="select_name(val.name,ind,val.id,val.type,val.label,val.disabled,$event)" :key="ind" :class="{'search-style-ind':searchStyleNum==ind,'is-disabled':val.disabled}">
<span>{{val.name}}</span> <span>{{val.name}}</span>

View File

@@ -267,6 +267,12 @@
type: 'select', type: 'select',
label: 'alertMessageState', label: 'alertMessageState',
disabled: false disabled: false
},{
id:26,
name: this.$t('alert.list.id'),
type: 'id',
label: 'id',
disabled: false
}], }],
}, },
searchLabel: { //搜索参数 searchLabel: { //搜索参数