From 79d1e74879f8d2cb80c74d3b498d436f04e0ffce Mon Sep 17 00:00:00 2001 From: shj <1790240199@qq.com> Date: 星期四, 31 三月 2022 11:37:09 +0800 Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf --- src/views/majorHazardSourceMonitoring/instrumentData/index.vue | 105 +++++++++++++++++++++++++--------------------------- 1 files changed, 50 insertions(+), 55 deletions(-) diff --git a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue index e716f71..09f6c2f 100644 --- a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue +++ b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue @@ -7,27 +7,12 @@ <el-input v-model="listQuery.filter.equipmentName" clearable></el-input> </el-form-item> </el-col> - <el-col :span="8" style="text-align: center"> - <el-button type="primary" icon="el-icon-search" @click="find()" class="btns" - >搜索</el-button - > - <el-button - type="primary" - icon="el-icon-plus" - class="btns" - @click="handleClick('', '新增')" - >新增</el-button - > - <el-button - type="primary" - icon="el-icon-plus" - class="btns" - @click="importData()" - >导入</el-button - > - <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns" - >重置</el-button - > + <el-col :span="10" style="text-align: center"> + <el-button type="primary" icon="el-icon-search" @click="find()" class="btns">搜索</el-button> + <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns">重置</el-button> + <el-button type="primary" icon="el-icon-plus" class="btns" @click="handleClick('', '新增')">新增</el-button> + <el-button type="primary" icon="el-icon-plus" class="btns" @click="importData()">导入</el-button> + <el-button type="primary" class="btns" @click="exportTemplate()">下载导入模板</el-button> </el-col> </el-row> </el-form> @@ -78,6 +63,7 @@ :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="recordTotal" + style="margin-top: 20px;" > </el-pagination> </div> @@ -120,36 +106,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="highLiquidAlarm"> - <el-input v-model.number="form.highLiquidAlarm" maxlength="50"></el-input> + <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="lowLiquidAlarm"> - <el-input v-model.number="form.lowLiquidAlarm" maxlength="50"></el-input> + <el-input v-model="form.lowLiquidAlarm" maxlength="50"></el-input> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="低低液位报警值" prop="lowLowLiquidAlarm"> - <el-input v-model.number="form.lowLowLiquidAlarm" maxlength="50"></el-input> + <el-input v-model="form.lowLowLiquidAlarm" maxlength="50"></el-input> </el-form-item> </el-col> </el-row> @@ -158,7 +144,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> @@ -173,6 +159,7 @@ } from "@/api/majorEquipmentData.js"; import { majorEquipmentErt } from "@/api/majorEquipment.js"; import XLSX from 'xlsx' + const exampleFile = require('@/assets/example/instrumentData.xlsx') export default { data() { return { @@ -208,27 +195,27 @@ { required: true, message: "请选择检测时间", trigger: "change"}, rangeLowerLimit:[ { required: true, message: "仪表量程下限不能为空", trigger: "change"}, - { type: 'number', message: '仪表量程下限必须为数字值'} + { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' } ], rangeUpperLimit:[ { required: true, message: "仪表量程上限不能为空", trigger: "change"}, - { type: 'number', message: '仪表量程上限必须为数字值'} + { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' } ], highHighLiquidAlarm:[ { required: true, message: "高高液位报警值不能为空", trigger: "change"}, - { type: 'number', message: '高高液位报警值必须为数字值'} + { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' } ], highLiquidAlarm:[ { required: true, message: "高液位报警值不能为空", trigger: "change"}, - { type: 'number', message: '高液位报警值必须为数字值'} + { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' } ], lowLiquidAlarm:[ { required: true, message: "低液位报警值不能为空", trigger: "change"}, - { type: 'number', message: '低液位报警值必须为数字值'} + { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' } ], lowLowLiquidAlarm:[ { required: true, message: "低低液位报警值不能为空", trigger: "change"}, - { type: 'number', message: '低低液位报警值必须为数字值'}, + { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' } ], }, equipmentName:[], @@ -240,6 +227,9 @@ this.initMajorEquipment() }, methods: { + exportTemplate(){ + window.open(exampleFile, '_blank') + }, importData(){ let input = document.createElement('input'); input.type = 'file'; @@ -466,10 +456,6 @@ title: "成功", }); } else { - this.$message({ - type: "warning", - message: res.data.message, - }); } }); } else { @@ -484,28 +470,37 @@ 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(); -- Gitblit v1.9.2