Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-04-06 1cc4eb09ce38f1f0db114b7d3570f92ceaf1d470

 src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue

@@ -199,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() {
@@ -232,14 +232,14 @@
                    this.title = "新增";
                    this.form = {
                        equipmentId: "",
                        status:'',
                        status:0,
                        remark:"",
                        alarmTime:"",
                        alarmInfo:""
                    };
                } else {
                    this.title = "编辑";
                    this.form = value;
                    this.form=JSON.parse(JSON.stringify(value));
                }
            },
            AddelementManagement() {
@@ -257,6 +257,10 @@
                                        title: "成功",
                                    });
                                } else {
                                    this.$message({
                                        type: "warning",
                                        message: res.data.message,
                                    });
                                }
                            });
                        } else {
@@ -271,6 +275,10 @@
                                        title: "成功",
                                    });
                                }else {
                                    this.$message({
                                        type: "warning",
                                        message: res.data.message,
                                    });
                                }
                            });
                        }
@@ -297,6 +305,11 @@
                                    type: "success",
                                    duration: 2000,
                                });
                            }else {
                                this.$message({
                                    type: "warning",
                                    message: res.data.message,
                                });
                            }
                        })
                    })