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

lyfO_o

2022-03-30 fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32

 src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue

@@ -4,17 +4,17 @@
            <el-row>
                <el-col :span="5">
                    <el-form-item label="设备名称">
                        <el-input v-model="listQuery.filter.equipmentName"></el-input>
                        <el-input v-model="listQuery.filter.equipmentName" clearable></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="5">
                    <el-form-item label="状态">
                        <el-select v-model="listQuery.filter.status" placeholder="请选择状态">
                    <el-form-item label="设备状态">
                        <el-select v-model="listQuery.filter.status" placeholder="请选择状态" clearable>
                            <el-option v-for="item in unitIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="4" style="text-align: center">
                <el-col :span="6" style="text-align: center">
                    <el-button type="primary" icon="el-icon-search" @click="find()" class="btns"
                    >搜索</el-button
                    >
@@ -24,6 +24,9 @@
                        class="btns"
                        @click="handleClick('', '新增')"
                    >新增</el-button
                    >
                    <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns"
                    >重置</el-button
                    >
                </el-col>
            </el-row>
@@ -120,8 +123,9 @@
                    <el-col :span="12">
                        <el-form-item label="报警时间" prop="alarmTime">
                            <el-date-picker
                                type="datetime"
                                v-model="form.alarmTime"
                                value-format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd HH:mm:ss"
                                placeholder="选择日期时间"
                            style="width: 100%;">
                            </el-date-picker>
@@ -131,7 +135,7 @@
                <el-row>
                    <el-col :span="24">
                        <el-form-item label="报警信息" prop="alarmInfo">
                            <el-input v-model="form.alarmInfo" maxlength="50"></el-input>
                            <el-input type="textarea" v-model="form.alarmInfo" placeholder="请输入报警信息" maxlength="50"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
@@ -180,13 +184,17 @@
                listQuery: {
                    filter: {
                        equipmentName: "",
                        // status:"",
                    },
                    pageIndex: 1,
                    pageSize: 10,
                },
                type:'',
                rules: {

                    equipmentId: { required: true, message: "请选择设备名称", trigger: "change"},
                    status: { 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}]
@@ -194,8 +202,15 @@
        },
        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);
@@ -211,10 +226,6 @@
                this.$nextTick(() => {
                    this.$refs["form"].clearValidate();
                });
                majorEquipmentErt().then(res=>{
                    console.log(res)
                    this.equipmentName=res.data.result
                })
                if (type == "新增") {
                    this.title = "新增";
                    this.form = {
@@ -273,21 +284,34 @@
                });
            },
            deleteById(val) {
                majorEquipmentDel({id:val}).then((res) => {
                    if (res.data.code == 200) {
                        this.elementManagementL();
                        this.$notify({
                            title: "成功",
                            message: "删除成功",
                            type: "success",
                            duration: 2000,
                        });
                    }
                });
                this.$confirm('确认删除吗','提示', {
                    confirmButtonText: '确认',
                    cancelButtonText: '取消',
                    type: 'warning'
                })
                    .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();
            },
            reset(){
                this.listQuery.filter={}
                this.elementManagementL();
            },
            handleSizeChange(val){
                this.listQuery.pageSize = val
                this.elementManagementL();