From 4a6b6d253451a14063df0659877f3d8c4ca921a5 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 31 三月 2022 15:20:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master --- src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue index 8b80821..97e7aad 100644 --- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue +++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue @@ -36,8 +36,8 @@ </el-table-column> <el-table-column label="状态" align="center"> <template slot-scope="scope"> - <span v-if="scope.row.status == 0">已处理</span> - <span v-if="scope.row.status == 1">未处理</span> + <span v-if="scope.row.status == 0">未处理</span> + <span v-if="scope.row.status == 1">已处理</span> </template> </el-table-column> <el-table-column prop="alarmTime" label="报警时间" align="center"> @@ -74,12 +74,14 @@ :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="recordTotal" + style="margin-top: 20px;" > </el-pagination> </div> <el-dialog :title="title" :visible.sync="dialogVisible" + :close-on-click-modal="false" width="40%" > <el-form ref="form" :rules="rules" :model="form" label-width="80px"> @@ -151,7 +153,7 @@ <el-button type="primary" class="btns" @click="AddelementManagement()" >确 定</el-button > - <el-button @click="dialogVisible = false">取 消</el-button> + <el-button @click="cancel()">取 消</el-button> </span> </el-dialog> </div> @@ -197,7 +199,7 @@ alarmInfo: { required: true, message: "请输入报警信息", trigger: "change"}, }, equipmentName:[], - unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}] + unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}], }; }, created() { @@ -255,10 +257,6 @@ title: "成功", }); } else { - this.$message({ - type: "warning", - message: res.data.message, - }); } }); } else { @@ -272,17 +270,17 @@ message: "编辑成功", title: "成功", }); - } else { - his.$message({ - type: "warning", - message: res.data.message, - }); + }else { } }); } } }); }, + cancel(){ + this.elementManagementL(); + this.dialogVisible = false + }, deleteById(val) { this.$confirm('确认删除吗','提示', { confirmButtonText: '确认', -- Gitblit v1.9.2