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(valueTemp
2) {
+ 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"
>
-->
+
+
+
+
+
+
+ 保存
+
+
+
row.isCheck === 1);
+ this.tableList.forEach(row => {
+ if(row.isCheck === 1){
+ this.$nextTick(() => {
+ this.$refs.multipleTable.toggleRowSelection(row)
+ })
+ }
+ });
+ console.log('3333333',this.selectedRows)
+ },
+
+ // 多选框选中数据
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id);
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
+ },
+
+ // 保存
+ handleSave() {
+ let ids = this.ids
+ this.$modal.confirm('是否确认保存?').then(function() {
+ return saveWarnSpaceTypeApi({ids});
+ }).then(() => {
+ this.queryWarnSpaceTypeList()
+ this.$modal.msgSuccess("保存成功");
+ }).catch(() => {});
+ },
},
mixins: [commonMixin],
components: {
FormWarning
},
created() {
+
queryLefSelApi({
dictType: 'dev_type'
}).then(res => {
@@ -166,8 +238,13 @@ export default {
/* this.sendRigCode = {
configuType: this.currentLefIndex
} */
- this.lefSelList = res.data.slice(0, 4).concat(res.data.slice(-2));
- }).catch(err => {})
+ // this.lefSelList = res.data.slice(0, 4).concat(res.data.slice(-2));
+ this.lefSelList = res.data.filter(item => {
+ return item.dictCode != 123 && item.dictCode != 124 && item.dictCode!= 136
+ })
+ }).catch(err => { })
+
+
},
data() {
return {
@@ -185,7 +262,15 @@ export default {
editDialogTitle: '修改配置',
lefSelList: [],
currentLefIndex: undefined,
- sendRigCode: undefined
+ sendRigCode: undefined,
+ // 选中数组
+ ids: [],
+ selectedRows: [],
+ // 非单个禁用
+ single: true,
+ // 非多个禁用
+ multiple: true,
+ tableList: [],
}
},
}