diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 4dd59cd..13a1f67 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -34,7 +34,7 @@
-
+
@@ -157,10 +157,10 @@
callback(new Error('请填写大于0的数字'))
} else {
const deep = parseFloat(value)
- if (deep > 100 || deep < 0) { callback(new Error('请填写0到100数值')) } else { callback() }
+ if (deep > 10 || deep < 0) { callback(new Error('请填写0到10数值')) } else { callback() }
}
} else {
- callback(new Error('井深不能为空'))
+ callback()
}
}
const validateLng = (rule, value, callback) => {
@@ -225,7 +225,7 @@
wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
position: [{ required: true, message: '窨井详细地址不能为空', trigger: ['blur', 'change'] }],
- // deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
+ deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 4dd59cd..13a1f67 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -34,7 +34,7 @@
-
+
@@ -157,10 +157,10 @@
callback(new Error('请填写大于0的数字'))
} else {
const deep = parseFloat(value)
- if (deep > 100 || deep < 0) { callback(new Error('请填写0到100数值')) } else { callback() }
+ if (deep > 10 || deep < 0) { callback(new Error('请填写0到10数值')) } else { callback() }
}
} else {
- callback(new Error('井深不能为空'))
+ callback()
}
}
const validateLng = (rule, value, callback) => {
@@ -225,7 +225,7 @@
wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
position: [{ required: true, message: '窨井详细地址不能为空', trigger: ['blur', 'change'] }],
- // deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
+ deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 7de979e..a026bd2 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -35,7 +35,7 @@
-
+
@@ -160,14 +160,14 @@
callback(new Error('请填写大于0的数字'))
} else {
const deep = parseFloat(value)
- if (deep > 100 || deep < 0) {
- callback(new Error('请填写0到100数值'))
+ if (deep > 10 || deep < 0) {
+ callback(new Error('请填写0到10数值'))
} else {
callback()
}
}
} else {
- callback(new Error('井深不能为空'))
+ callback()
}
}
const validateLng = (rule, value, callback) => {
@@ -231,7 +231,7 @@
wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
position: [{ required: true, message: '窨井详细地址不能为空', trigger: ['blur', 'change'] }],
- // deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
+ deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 4dd59cd..13a1f67 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -34,7 +34,7 @@
-
+
@@ -157,10 +157,10 @@
callback(new Error('请填写大于0的数字'))
} else {
const deep = parseFloat(value)
- if (deep > 100 || deep < 0) { callback(new Error('请填写0到100数值')) } else { callback() }
+ if (deep > 10 || deep < 0) { callback(new Error('请填写0到10数值')) } else { callback() }
}
} else {
- callback(new Error('井深不能为空'))
+ callback()
}
}
const validateLng = (rule, value, callback) => {
@@ -225,7 +225,7 @@
wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
position: [{ required: true, message: '窨井详细地址不能为空', trigger: ['blur', 'change'] }],
- // deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
+ deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 7de979e..a026bd2 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -35,7 +35,7 @@
-
+
@@ -160,14 +160,14 @@
callback(new Error('请填写大于0的数字'))
} else {
const deep = parseFloat(value)
- if (deep > 100 || deep < 0) {
- callback(new Error('请填写0到100数值'))
+ if (deep > 10 || deep < 0) {
+ callback(new Error('请填写0到10数值'))
} else {
callback()
}
}
} else {
- callback(new Error('井深不能为空'))
+ callback()
}
}
const validateLng = (rule, value, callback) => {
@@ -231,7 +231,7 @@
wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
position: [{ required: true, message: '窨井详细地址不能为空', trigger: ['blur', 'change'] }],
- // deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
+ deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index cf114ed..54dd4a8 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -179,7 +179,7 @@
responsibleDept: row.responsibleDept // 维护人员部门
}
this.center = { lng: row.coordinateX, lat: row.coordinateY }
- this.markers.push({ position: { lng: row.coordinateX, lat: row.coordinateY } })
+ this.markers.push({ position: { lng: row.coordinateX, lat: row.coordinateY }})
if (row.deptid && row.deptid !== '') {
this.fetchArea1()
this.fetchArea2()
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 4dd59cd..13a1f67 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -34,7 +34,7 @@
-
+
@@ -157,10 +157,10 @@
callback(new Error('请填写大于0的数字'))
} else {
const deep = parseFloat(value)
- if (deep > 100 || deep < 0) { callback(new Error('请填写0到100数值')) } else { callback() }
+ if (deep > 10 || deep < 0) { callback(new Error('请填写0到10数值')) } else { callback() }
}
} else {
- callback(new Error('井深不能为空'))
+ callback()
}
}
const validateLng = (rule, value, callback) => {
@@ -225,7 +225,7 @@
wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
position: [{ required: true, message: '窨井详细地址不能为空', trigger: ['blur', 'change'] }],
- // deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
+ deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 7de979e..a026bd2 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -35,7 +35,7 @@
-
+
@@ -160,14 +160,14 @@
callback(new Error('请填写大于0的数字'))
} else {
const deep = parseFloat(value)
- if (deep > 100 || deep < 0) {
- callback(new Error('请填写0到100数值'))
+ if (deep > 10 || deep < 0) {
+ callback(new Error('请填写0到10数值'))
} else {
callback()
}
}
} else {
- callback(new Error('井深不能为空'))
+ callback()
}
}
const validateLng = (rule, value, callback) => {
@@ -231,7 +231,7 @@
wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
position: [{ required: true, message: '窨井详细地址不能为空', trigger: ['blur', 'change'] }],
- // deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
+ deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index cf114ed..54dd4a8 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -179,7 +179,7 @@
responsibleDept: row.responsibleDept // 维护人员部门
}
this.center = { lng: row.coordinateX, lat: row.coordinateY }
- this.markers.push({ position: { lng: row.coordinateX, lat: row.coordinateY } })
+ this.markers.push({ position: { lng: row.coordinateX, lat: row.coordinateY }})
if (row.deptid && row.deptid !== '') {
this.fetchArea1()
this.fetchArea2()
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 7d3e429..cab74c7 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -27,7 +27,7 @@
-
+
导出记录
@@ -276,7 +276,7 @@
} else {
this.$message.error(res.message)
}
- }).catch(err => {
+ }).catch(() => {
loading.close()
})
this.fileList = []