Commit 8e9e3661 authored by xuke's avatar xuke

提交-报警参数

parent 4aa69a06
...@@ -404,8 +404,8 @@ const routes = [ ...@@ -404,8 +404,8 @@ const routes = [
{ {
path: "/Scheduling/EnergyManage", path: "/Scheduling/EnergyManage",
name: "EnergyManagePage", name: "EnergyManagePage",
component: () => import("@/views/SmartNumbers/PipeTemperature.vue"), // component: () => import("@/views/SmartNumbers/PipeTemperature.vue"),
// component: () => import("@/views/SchedulingPage/EnergyManagePage.vue"), component: () => import("@/views/SchedulingPage/EnergyManagePage.vue"),
meta: { meta: {
title: "能源消耗", title: "能源消耗",
}, },
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-row> <el-row v-show="dialog_content">
<el-col :span="6"> <el-col :span="6">
<div class="left"> <div class="left">
<el-table :data="cnNames_before" class="scroll-table" :row-style="{ height: '16px' }" <el-table :data="cnNames_before" class="scroll-table" :row-style="{ height: '16px' }"
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<el-col :span="12"> <el-col :span="12">
<div class="middle"> <div class="middle">
<el-form ref="formRef" :model="addParams" :rules="rules" label-width="auto"> <el-form ref="formRef" :model="addParams" :rules="rules" label-width="auto" :disabled="form_control">
<table cellpadding="0" cellspacing="1" border="1" class="big_table"> <table cellpadding="0" cellspacing="1" border="1" class="big_table">
<tr> <tr>
<th style="width: 25%">报警名称:</th> <th style="width: 25%">报警名称:</th>
...@@ -574,35 +574,30 @@ let param = ref({ ...@@ -574,35 +574,30 @@ let param = ref({
//表单校验规则 //表单校验规则
const formRef = ref() const formRef = ref()
addParams.value = {}
const rules = reactive({ const rules = reactive({
topMost: [ topMost: [
{ required: true, message: "上上限值是必填项", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "上上限值是 1-10位实数", trigger: "blur" }
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "上上限值输入不合法", trigger: "blur" },
{ min: 1, max: 10, message: '上上限值必须是 1-10位的数字', trigger: 'blur' }
], ],
upper: [ upper: [
{ required: true, message: "上限值是必填项", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "上限值是 1-10位实数", trigger: "blur" }
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "上限值输入不合法", trigger: "blur" },
{ min: 1, max: 10, message: '上限值必须是 1-10位的数字', trigger: 'blur' }
], ],
lower: [ lower: [
{ required: true, message: "下限值是必填项", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "下限值是 1-10位实数", trigger: "blur" }
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "下限值输入不合法", trigger: "blur" },
{ min: 1, max: 10, message: '下限值必须是 1-10位的数字', trigger: 'blur' }
], ],
downMost: [ downMost: [
{ required: true, message: "下下限值是必填项", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "下下限值是 1-10位实数", trigger: "blur" }
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "下下限值输入不合法", trigger: "blur" },
{ min: 1, max: 10, message: '下下限值必须是 1-10位的数字', trigger: 'blur' }
] ]
}); });
let newType = ref(0) let newType = ref(0)
watchEffect(() => { watchEffect(() => {
console.log("监听::::", type.value); // console.log("监听::::", type.value);
if (type.value === "GetPipeAlarmStatusData") { if (type.value === "GetPipeAlarmStatusData") {
newType.value = 1 newType.value = 1
param.value.baseId = "pipeParaBaseId" param.value.baseId = "pipeParaBaseId"
...@@ -628,9 +623,17 @@ const getCnNames = () => { ...@@ -628,9 +623,17 @@ const getCnNames = () => {
}); });
} }
// 表单编辑控制
const dialog_content = ref(false)
const form_control = ref(true)
// 点击确定查询数据 // 点击确定查询数据
const paramsSetting = () => { const paramsSetting = () => {
dialog_content.value = true
getCnNames() getCnNames()
ElMessage.info("请选择参数后进行编辑...")
} }
// newRow接收param.value.baseId,添加需要使用 // newRow接收param.value.baseId,添加需要使用
...@@ -659,6 +662,7 @@ const selectBeforeParams = (row) => { ...@@ -659,6 +662,7 @@ const selectBeforeParams = (row) => {
// console.log("查看baseId --- dataaaaa:", data); // console.log("查看baseId --- dataaaaa:", data);
data.then(function () { data.then(function () {
param.value.cnName = row.cnName param.value.cnName = row.cnName
form_control.value = false
}); });
} else { } else {
ElMessage.info("该参数暂不需要修改...") ElMessage.info("该参数暂不需要修改...")
...@@ -692,6 +696,7 @@ const selectAfterParams = (row) => { ...@@ -692,6 +696,7 @@ const selectAfterParams = (row) => {
// 数据回显 // 数据回显
addParams.value = { ...val.data } addParams.value = { ...val.data }
param.value.cnName = row.cnName param.value.cnName = row.cnName
form_control.value = false
if (type.value === 1) { if (type.value === 1) {
delId.value = val.data.pipeAlarmParaId delId.value = val.data.pipeAlarmParaId
} else if (type.value === 2) { } else if (type.value === 2) {
...@@ -711,61 +716,73 @@ const selectAfterParams = (row) => { ...@@ -711,61 +716,73 @@ const selectAfterParams = (row) => {
const onAdd = () => { const onAdd = () => {
// console.log("!!!!!!!", addParams.value); // console.log("!!!!!!!", addParams.value);
addParams.value.updateNullFields = "" // 提交添加或修改-以上至少有一个选项有值
if (newType.value === 1) { if (addParams.value.topMost || addParams.value.upper || addParams.value.lower || addParams.value.downMost) {
addParams.value.pipeId = dept.value // 执行添加或修改
addParams.value.pipeParaBaseId = newRow.value addParams.value.updateNullFields = ""
if (dept.value === "f8fdf686-30ec-4e4c-ab60-d74ec8b98e3f") { if (newType.value === 1) {
addParams.value.gatherType = 4 addParams.value.pipeId = dept.value
} else { addParams.value.pipeParaBaseId = newRow.value
addParams.value.gatherType = 1 if (dept.value === "f8fdf686-30ec-4e4c-ab60-d74ec8b98e3f") {
} addParams.value.gatherType = 4
http.post("api/alarm/para/pipesave", { ...addParams.value }, false).then((res) => {
if (res.success) {
ElMessage.success(res.message)
delete addParams.value.pipeId
delete addParams.value.pipeParaBaseId
delete addParams.value.gatherType
delete addParams.value.voicePath
reset()
param.value.cnName = ""
getCnNames()
} else {
ElMessage.error("操作失败")
}
})
} else if (newType.value === 2) {
addParams.value.boilerParaBaseId = newRow.value
addParams.value.boilerId = dept.value
http.post("api/alarm/para/boilersave", { ...addParams.value }, false).then((res) => {
if (res.success) {
ElMessage.success(res.message)
delete addParams.value.boilerParaBaseId
delete addParams.value.boilerId
reset()
param.value.cnName = ""
getCnNames()
} else { } else {
ElMessage.error("操作失败") addParams.value.gatherType = 1
} }
})
} else if (newType.value === 3) { http.post("api/alarm/para/pipesave", { ...addParams.value }, false).then((res) => {
addParams.value.transParaBaseId = newRow.value if (res.success) {
addParams.value.unitId = dept.value ElMessage.success(res.message)
http.post("api/alarm/para/transsave", { ...addParams.value }, false).then((res) => { delete addParams.value.pipeId
if (res.success) { delete addParams.value.pipeParaBaseId
ElMessage.success(res.message) delete addParams.value.gatherType
delete addParams.value.transParaBaseId delete addParams.value.voicePath
delete addParams.value.unitId reset()
reset() param.value.cnName = ""
param.value.cnName = "" form_control.value = true
getCnNames() getCnNames()
} else { } else {
ElMessage.error("操作失败") ElMessage.error("操作失败")
} }
}) })
} else if (newType.value === 2) {
addParams.value.boilerParaBaseId = newRow.value
addParams.value.boilerId = dept.value
http.post("api/alarm/para/boilersave", { ...addParams.value }, false).then((res) => {
if (res.success) {
ElMessage.success(res.message)
delete addParams.value.boilerParaBaseId
delete addParams.value.boilerId
reset()
param.value.cnName = ""
form_control.value = true
getCnNames()
} else {
ElMessage.error("操作失败")
}
})
} else if (newType.value === 3) {
addParams.value.transParaBaseId = newRow.value
addParams.value.unitId = dept.value
http.post("api/alarm/para/transsave", { ...addParams.value }, false).then((res) => {
if (res.success) {
ElMessage.success(res.message)
delete addParams.value.transParaBaseId
delete addParams.value.unitId
reset()
param.value.cnName = ""
form_control.value = true
getCnNames()
} else {
ElMessage.error("操作失败")
}
})
}
} else {
ElMessage.error("请至少输入一个报警上下限数值")
} }
} }
// 按钮 // 按钮
...@@ -785,6 +802,8 @@ const onDel = () => { ...@@ -785,6 +802,8 @@ const onDel = () => {
http.post("api/alarm/para/pipedelete", { id: delId.value }, false).then((res) => { http.post("api/alarm/para/pipedelete", { id: delId.value }, false).then((res) => {
if (res.success) { if (res.success) {
ElMessage.success(res.message) ElMessage.success(res.message)
param.value.cnName = ""
form_control.value = true
reset() reset()
} else { } else {
ElMessage.error("删除失败!!") ElMessage.error("删除失败!!")
...@@ -794,6 +813,8 @@ const onDel = () => { ...@@ -794,6 +813,8 @@ const onDel = () => {
http.post("api/alarm/para/boilerdelete", { id: delId.value }, false).then((res) => { http.post("api/alarm/para/boilerdelete", { id: delId.value }, false).then((res) => {
if (res.success) { if (res.success) {
ElMessage.success(res.message) ElMessage.success(res.message)
param.value.cnName = ""
form_control.value = true
reset() reset()
} else { } else {
ElMessage.error("删除失败") ElMessage.error("删除失败")
...@@ -803,6 +824,8 @@ const onDel = () => { ...@@ -803,6 +824,8 @@ const onDel = () => {
http.post("api/alarm/para/transdelete", { id: delId.value }, false).then((res) => { http.post("api/alarm/para/transdelete", { id: delId.value }, false).then((res) => {
if (res.success) { if (res.success) {
ElMessage.success(res.message) ElMessage.success(res.message)
param.value.cnName = ""
form_control.value = true
reset() reset()
} else { } else {
ElMessage.error("删除失败") ElMessage.error("删除失败")
...@@ -815,7 +838,6 @@ const onDel = () => { ...@@ -815,7 +838,6 @@ const onDel = () => {
}).finally(() => { }).finally(() => {
getCnNames() getCnNames()
}) })
} }
// 关闭dialog右上× 清空数据 // 关闭dialog右上× 清空数据
...@@ -828,6 +850,12 @@ const onClose = () => { ...@@ -828,6 +850,12 @@ const onClose = () => {
param.value.cnName = "" param.value.cnName = ""
} }
// watchEffect(() => {
// if (param.value.cnName) {
// form_control.value = false
// }
// })
onMounted(() => { onMounted(() => {
getuser() getuser()
setContentHeight(); setContentHeight();
......
...@@ -166,11 +166,12 @@ import { ElMessage } from "element-plus"; ...@@ -166,11 +166,12 @@ import { ElMessage } from "element-plus";
const options = reactive([]); const options = reactive([]);
import store from "../../store/index"; import store from "../../store/index";
import { vFloatNumber } from "@/utils/directives.js"; import { vFloatNumber } from "@/utils/directives.js";
import { nextTick } from "vue";
const loading = ref(false) const loading = ref(false)
const form = ref({ const form = ref({
types: [], types: [],
}); });
const formRef = ref() let formRef = ref()
const formDatas = ref([ const formDatas = ref([
{ {
...@@ -189,34 +190,33 @@ const formDatas = ref([ ...@@ -189,34 +190,33 @@ const formDatas = ref([
//表单校验规则 //表单校验规则
// 正则 /^(-?[0-9]+(\.[0-9]+)?){1,10}$/ ==> {1-10}不起作用,下面又一遍 // 正则 /^(-?\d{1,5})(\.[0-9]{1,4})?$/
// 正负可选
// 整数位至多5位
// 小数可选,小数部分之多4位
const rules = reactive({ const rules = reactive({
openingOfElectricValve: [ openingOfElectricValve: [
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "电动调节阀开度输入不合法", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "电动调节阀开度必须是 1-10位实数", trigger: "blur" }
{ min: 1, max: 10, message: '电动调节阀开度必须是 1-10位的数字', trigger: 'change' }
], ],
boilerOutletWaterTemperature: [ boilerOutletWaterTemperature: [
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "锅炉出水温度输入不合法", trigger: "blur" }, { pattern: /^(-?\d{1,5})(\.[0-9]{1,4})?$/, message: "锅炉出水温度输入不合法", trigger: "blur" }
{ min: 1, max: 10, message: '锅炉出水温度必须是 1-10位的数字', trigger: 'change' }
], ],
upperLlimitMainFlow: [ upperLlimitMainFlow: [
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "锅炉房供水总管流量上限值输入不合法", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "锅炉房供水总管流量上限值是 1-10位实数", trigger: "blur" }
{ min: 1, max: 10, message: '锅炉房供水总管流量上限值必须是 1-10位的数字', trigger: 'change' }
], ],
lowerLlimitMainFlow: [ lowerLlimitMainFlow: [
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "锅炉房供水总管流量下限值输入不合法", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "锅炉房供水总管流量下限值是 1-10实数", trigger: "blur" }
{ min: 1, max: 10, message: '锅炉房供水总管流量下限值必须是 1-10位的数字', trigger: 'change' }
], ],
maxTargetTemperature: [ maxTargetTemperature: [
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "目标温度最大值输入不合法", trigger: "blur" }, { pattern: /^(-?\d{1,5})(\.[0-9]{1,4})?$/, message: "目标温度最大值输入不合法", trigger: "blur" },
{ min: 1, max: 10, message: '目标温度最大值必须是 1-10位的数字', trigger: 'change' }
], ],
bestHoldingTime: [ bestHoldingTime: [
{ pattern: /^(-?[0-9]+(\.[0-9]+)?){1,10}$/, message: "持续时间输入不合法", trigger: "blur" }, { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "持续时间必须是 1-10位实数", trigger: "blur" }
{ min: 1, max: 10, message: '持续时间必须是 1-10位的数字', trigger: 'change' }
], ],
holdingTime: [ holdingTime: [
{ pattern: /^[0-9]\d{1,10}$/, "message": "保持时间必须是 1-10位的数字", trigger: 'change' } { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "保持时间必须是 1-10位实数", trigger: "blur" }
] ]
}); });
...@@ -278,9 +278,19 @@ function getSupplys() { ...@@ -278,9 +278,19 @@ function getSupplys() {
} }
// console.log("遍历的options===========>:", options); // console.log("遍历的options===========>:", options);
} }
const clearFormValidation = () => {
nextTick(() => {
formRef.value?.clearValidate()
})
}
onMounted(() => { onMounted(() => {
getListData(); getListData();
getSupplys(); getSupplys();
clearFormValidation()
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment