From 67dda3891d35ae121a3109c5405b602410752571 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Fri, 3 Jan 2025 18:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AF=86=E5=88=AB=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8CGll=E8=AE=BE=E5=A4=87=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/warning.js | 12 + .../base/warning/components/form-warning.vue | 385 ++++++++++++++++++ src/views/base/warning/index.vue | 95 ++++- 3 files changed, 487 insertions(+), 5 deletions(-) diff --git a/src/api/base/warning.js b/src/api/base/warning.js index b87ac047..409f1ec0 100644 --- a/src/api/base/warning.js +++ b/src/api/base/warning.js @@ -52,3 +52,15 @@ export const editWarningApi = (data) => { export const deleteWarningApi = (data) => { return request.post('/base/tbWarnConfig/deleteById',data) } + +/** 查询受限空间违章类型 */ +export const queryWarnSpaceTypeApi = (data) => { + return request.get('/base/tbWarnConfig/getWarnSpaceType', { + params: data + }) +} + +//保存 +export function saveWarnSpaceTypeApi(data) { + return request.post('/base/tbWarnConfig/saveWarnSpaceType',data) +} \ No newline at end of file diff --git a/src/views/base/warning/components/form-warning.vue b/src/views/base/warning/components/form-warning.vue index a6a15b5e..c95fc502 100644 --- a/src/views/base/warning/components/form-warning.vue +++ b/src/views/base/warning/components/form-warning.vue @@ -341,6 +341,72 @@ + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + + + + +
{ + if (value === '' || value === null) { + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const regexTwo = /^(0|[1-9]\d*)(\.\d{0,2})?$/; + if(!regexTwo.test(value)){ + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const valueTemp = parseFloat(value); + if(valueTemp.toString().includes('.')==true){ + if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + configVal1Max: [ + { + required: true, + message: '请输入测量阈值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + const valueTemp = parseFloat(value); + if(valueTemp2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + configVal2Min: [ + { + required: true, + message: '请输入变化阈值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + if (value === '' || value === null) { + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const regexTwo = /^(0|[1-9]\d*)(\.\d{0,2})?$/; + if(!regexTwo.test(value)){ + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const valueTemp = parseFloat(value); + if(valueTemp.toString().includes('.')==true){ + if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + configVal2Max: [ + { + required: true, + message: '请输入变化阈值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + const valueTemp = parseFloat(value); + if(valueTemp2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + configVal3Min: [ + { + required: true, + message: '请输入累加阈值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + if (value === '' || value === null) { + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const regexTwo = /^(0|[1-9]\d*)(\.\d{0,2})?$/; + if(!regexTwo.test(value)){ + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const valueTemp = parseFloat(value); + if(valueTemp.toString().includes('.')==true){ + if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + configVal3Max: [ + { + required: true, + message: '请输入累加阈值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + const valueTemp = parseFloat(value); + if(valueTemp2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + configVal4Min: [ + { + required: true, + message: '请输入基础沉降阈值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + if (value === '' || value === null) { + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const regexTwo = /^(0|[1-9]\d*)(\.\d{0,2})?$/; + if(!regexTwo.test(value)){ + return callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } + const valueTemp = parseFloat(value); + if(valueTemp.toString().includes('.')==true){ + if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + configVal4Max: [ + { + required: true, + message: '请输入基础沉降阈值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + const valueTemp = parseFloat(value); + if(valueTemp2) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + }else{ + if (valueTemp < 0 ) { + callback(new Error('请输入大于零的数据且小数点后最多保留两位')); + } else { + callback(); + } + } + trigger: 'blur' + } + } + ], + + }, // 各类下拉 projRange: [], provinceRange: [], @@ -2020,6 +2387,15 @@ export default { } }) break; + case 137: + this.$refs.projectParamsRef7.validate(valid => { + if(valid) { + this.projectParams7.configuType = this.formCount + console.log(this.projectParams7, 'form7') + this.handleAdd(this.projectParams7) + } + }) + break; } }, async handleAdd(param) { @@ -2086,6 +2462,15 @@ export default { } }) break; + case 137: + this.$refs.projectParamsRef7.validate(valid => { + if(valid) { + this.projectParams7.configuType = this.formCount + console.log(this.projectParams7, 'form7') + this.handleEdit(this.projectParams7) + } + }) + break; } }, async handleEdit(param) { diff --git a/src/views/base/warning/index.vue b/src/views/base/warning/index.vue index 56cc3bfe..3ee3fb67 100644 --- a/src/views/base/warning/index.vue +++ b/src/views/base/warning/index.vue @@ -20,6 +20,7 @@ @transIdList="getIdList" :show-right-tools="false" style="flex: 1" + v-if="currentLefIndex!=135" >