From 3893e9e9ff8688dbba26692cd89ec6ee1efd2ed3 Mon Sep 17 00:00:00 2001
From: lai_kd <lai_kd@123>
Date: Mon, 9 Sep 2019 16:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=AE=9A=E4=B9=89=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E6=9E=9A=E4=B8=BE=E5=80=BC=E4=B8=8E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 console-web/src/views/modules/pub/buidct.vue               | 7 ++++---
 console-web/src/views/modules/pub/buimsg-add-or-update.vue | 7 +++++--
 console-web/src/views/modules/pub/buimsg.vue               | 2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/console-web/src/views/modules/pub/buidct.vue b/console-web/src/views/modules/pub/buidct.vue
index b71d3481..a64c2a61 100755
--- a/console-web/src/views/modules/pub/buidct.vue
+++ b/console-web/src/views/modules/pub/buidct.vue
@@ -136,9 +136,10 @@
           url: this.$http.adornUrl('/buipubbpc1/buiDctList.do'),
           method: 'get',
           params: this.$http.adornParams({
-            'page_no': this.pageIndex,
-            'page_size': this.pageSize,
-            'tot_rec_num': this.totalPage,
+            'pag_no': this.pageIndex,
+            'limit': this.pageSize,
+            'totalrows': this.totalPage,
+            'search': this.dataForm.search,
             'dct_nm': this.dataForm.key
           })
         }).then(({data}) => {
diff --git a/console-web/src/views/modules/pub/buimsg-add-or-update.vue b/console-web/src/views/modules/pub/buimsg-add-or-update.vue
index 8faf4659..29595475 100644
--- a/console-web/src/views/modules/pub/buimsg-add-or-update.vue
+++ b/console-web/src/views/modules/pub/buimsg-add-or-update.vue
@@ -65,8 +65,11 @@
       <el-row type="flex" class="row-bg">
         <el-col :span="12">
           <el-form-item label="告警级别" prop="bmsg_inf">
-            <el-select :readonly="readonly" v-model="dataForm.bmsg_inf" placeholder="告警级别"
-                       style="width:170px"></el-select>
+            <!--<el-select :readonly="readonly" v-model="dataForm.bmsg_inf" placeholder="告警级别" style="width:170px"></el-select>-->
+            <el-select v-model="dataForm.bmsg_inf" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('bmsg_inf')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/console-web/src/views/modules/pub/buimsg.vue b/console-web/src/views/modules/pub/buimsg.vue
index 4f1c1230..0d513fc6 100644
--- a/console-web/src/views/modules/pub/buimsg.vue
+++ b/console-web/src/views/modules/pub/buimsg.vue
@@ -79,6 +79,8 @@
       </el-table-column>
       <el-table-column
         prop="bmsg_inf"
+        column-key="bmsg_inf"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="告警级别">