Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web

src/api/portal/GATHERWARNING/GATHERWARNING.js

@@ -55,7 +55,7 @@ export function delGATHERWARNING(id) {
 // 处理预警  解除
 export function deal(id) {
   return request({
-    url: '/gather/WARNING/deal/{id}' + id,
+    url: '/gather/WARNING/deal/' + id,
     method: 'get'
   })
 }
@@ -64,7 +64,7 @@ export function deal(id) {
 // 取消预警
 export function cancel(id) {
   return request({
-    url: '/gather/WARNING/cancel/{id}' + id,
+    url: '/gather/WARNING/cancel/' + id,
     method: 'get'
   })
 }

src/views/LEAVEMESSAGE/index.vue

@@ -47,7 +47,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:LEAVEMESSAGE:edit']">回复</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:LEAVEMESSAGE:edit']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:LEAVEMESSAGE:remove']">删除</el-button>
         </template>
       </el-table-column>