Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

shj

2022-03-31 6e3961ad82e2dfb204b79caf50c6637c15cfbe8d

 src/views/majorHazardSourceMonitoring/instrumentData/index.vue

@@ -4,7 +4,7 @@
            <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="8" style="text-align: center">
@@ -25,7 +25,9 @@
                        @click="importData()"
                    >导入</el-button
                    >

                    <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns"
                    >重置</el-button
                    >
                </el-col>
            </el-row>
        </el-form>
@@ -45,6 +47,8 @@
            <el-table-column prop="lowLiquidAlarm" label="低液位报警值" align="center">
            </el-table-column>
            <el-table-column prop="lowLowLiquidAlarm" label="低低液位报警值" align="center">
            </el-table-column>
            <el-table-column prop="monitoringTime" label="检测时间" align="center">
            </el-table-column>
            <el-table-column align="center" label="操作">
                <template slot-scope="scope">
@@ -74,6 +78,7 @@
                :page-size="pageSize"
                layout="total, sizes, prev, pager, next, jumper"
                :total="recordTotal"
                style="margin-top: 20px;"
            >
            </el-pagination>
        </div>
@@ -104,8 +109,9 @@
                    <el-col :span="12">
                        <el-form-item label="检测时间" prop="monitoringTime">
                            <el-date-picker
                                type="datetime"
                                v-model="form.monitoringTime"
                                value-format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd HH:mm:ss"
                                placeholder="选择日期时间"
                            style="width: 100%;">
                            </el-date-picker>
@@ -115,36 +121,36 @@
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="仪表量程下限" prop="rangeLowerLimit">
                            <el-input v-model.number="form.rangeLowerLimit" maxlength="50"></el-input>
                            <el-input v-model="form.rangeLowerLimit" maxlength="50"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="仪表量程上限" prop="rangeLowerLimit">
                            <el-input v-model.number="form.rangeUpperLimit" maxlength="50"></el-input>
                        <el-form-item label="仪表量程上限" prop="rangeUpperLimit">
                            <el-input v-model="form.rangeUpperLimit" maxlength="50"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="高高液位报警值" prop="rangeUpperLimit">
                            <el-input v-model.number="form.highHighLiquidAlarm" maxlength="50"></el-input>
                        <el-form-item label="高高液位报警值" prop="highHighLiquidAlarm">
                            <el-input v-model="form.highHighLiquidAlarm" maxlength="50"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="高液位报警值" prop="alarmInfo">
                            <el-input v-model.number="form.highLiquidAlarm" maxlength="50"></el-input>
                        <el-form-item label="高液位报警值" prop="highLiquidAlarm">
                            <el-input v-model="form.highLiquidAlarm" maxlength="50"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="低液位报警值" prop="alarmInfo">
                            <el-input v-model.number="form.lowLiquidAlarm" maxlength="50"></el-input>
                        <el-form-item label="低液位报警值" prop="lowLiquidAlarm">
                            <el-input v-model="form.lowLiquidAlarm" maxlength="50"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="低低液位报警值" prop="alarmInfo">
                            <el-input v-model.number="form.lowLowLiquidAlarm" maxlength="50"></el-input>
                        <el-form-item label="低低液位报警值" prop="lowLowLiquidAlarm">
                            <el-input v-model="form.lowLowLiquidAlarm" maxlength="50"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
@@ -153,7 +159,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>
@@ -191,19 +197,40 @@
                listQuery: {
                    filter: {
                        equipmentId: "",
                        status:'',
                    },
                    pageIndex: 1,
                    pageSize: 10,
                },
                // type:'',
                rules: {
                    rangeLowerLimit:{ type: 'number', message: '仪表量程下限必须为数字值'},
                    rangeUpperLimit:{ type: 'number', message: '仪表量程上限必须为数字值'},
                    highHighLiquidAlarm:{ type: 'number', message: '高高液位报警值必须为数字值'},
                    highLiquidAlarm:{ type: 'number', message: '高液位报警值必须为数字值'},
                    lowLiquidAlarm:{ type: 'number', message: '低液位报警值必须为数字值'},
                    lowLowLiquidAlarm:{ type: 'number', message: '低低液位报警值必须为数字值'},
                    equipmentId:
                        { required: true, message: "请选择设备名称", trigger: "change" },
                    monitoringTime:
                        { required: true, message: "请选择检测时间", trigger: "change"},
                    rangeLowerLimit:[
                        { required: true, message: "仪表量程下限不能为空", trigger: "change"},
                        { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
                    ],
                    rangeUpperLimit:[
                        { required: true, message: "仪表量程上限不能为空", trigger: "change"},
                        { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
                    ],
                    highHighLiquidAlarm:[
                        { required: true, message: "高高液位报警值不能为空", trigger: "change"},
                        { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
                    ],
                    highLiquidAlarm:[
                        { required: true, message: "高液位报警值不能为空", trigger: "change"},
                        { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
                    ],
                    lowLiquidAlarm:[
                        { required: true, message: "低液位报警值不能为空", trigger: "change"},
                        { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
                    ],
                    lowLowLiquidAlarm:[
                        { required: true, message: "低低液位报警值不能为空", trigger: "change"},
                        { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
                    ],
                },
                equipmentName:[],
                unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}]
@@ -421,6 +448,8 @@
                } else {
                    this.title = "编辑";
                    this.form = value;
                    console.log(123,this.form)
                    console.log(222,this.equipmentName)
                }
            },
            AddelementManagement() {
@@ -438,10 +467,6 @@
                                        title: "成功",
                                    });
                                } else {
                                    this.$message({
                                        type: "warning",
                                        message: res.data.message,
                                    });
                                }
                            });
                        } else {
@@ -456,32 +481,45 @@
                                        title: "成功",
                                    });
                                } else {
                                    his.$message({
                                        type: "warning",
                                        message: res.data.message,
                                    });
                                }
                            });
                        }
                    }
                });
            },
            cancel(){
                this.elementManagementL();
                this.dialogVisible = false
            },
            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.equipmentName = "";
                this.elementManagementL();
            },
            handleSizeChange(val){
                this.listQuery.pageSize = val
                this.elementManagementL();