From 6cda1fb9d6c914b3dd985b8dceb911533f52e241 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 31 三月 2022 14:23:26 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 85789ba..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>
@@ -193,17 +195,24 @@
rules: {
equipmentId: { required: true, message: "请选择设备名称", trigger: "change"},
status: { required: true, message: "请选择设备状态", trigger: "change"},
- alarmTime: { required: true, message: "请选择报警事件", trigger: "change"},
+ alarmTime: { required: true, message: "请选择报警时间", trigger: "change"},
alarmInfo: { required: true, message: "请输入报警信息", trigger: "change"},
},
equipmentName:[],
- unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}]
+ unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}],
};
},
created() {
this.elementManagementL();
+ this.alarmMajorEquipmentErt();
},
methods: {
+ alarmMajorEquipmentErt(){
+ majorEquipmentErt().then(res=>{
+ console.log(res)
+ this.equipmentName=res.data.result
+ })
+ },
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
console.log(res);
@@ -219,10 +228,6 @@
this.$nextTick(() => {
this.$refs["form"].clearValidate();
});
- majorEquipmentErt().then(res=>{
- console.log(res)
- this.equipmentName=res.data.result
- })
if (type == "新增") {
this.title = "新增";
this.form = {
@@ -252,10 +257,6 @@
title: "成功",
});
} else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
} else {
@@ -269,16 +270,16 @@
message: "编辑成功",
title: "成功",
});
- } else {
- his.$message({
- type: "warning",
- message: res.data.message,
- });
+ }else {
}
});
}
}
});
+ },
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false
},
deleteById(val) {
this.$confirm('确认删除吗','提示', {
@@ -286,17 +287,21 @@
cancelButtonText: '取消',
type: 'warning'
})
- majorEquipmentDel({id:val}).then((res) => {
- if (res.data.code == 200) {
- this.elementManagementL();
- this.$notify({
- title: "成功",
- message: "删除成功",
- type: "success",
- duration: 2000,
- });
- }
- });
+ .then(()=>{
+ majorEquipmentDel({id:val}).then((res) => {
+ if (res.data.code == 200) {
+ this.elementManagementL();
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ }
+ })
+ })
+ .catch(error =>{
+ });
},
find(){
this.elementManagementL();
--
Gitblit v1.9.2