diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0ced92b..4dd59cd 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -280,6 +280,7 @@
},
qu(val) { // 监控区变化
if (val !== '') {
+ this.wellForm.area = ''
this.fetchArea2()
}
}
@@ -375,7 +376,7 @@
}
// 如果责任部门不选,则用权属作为责任部门
if (this.wellForm.responsibleDept === '') {
- if (this.secondDeptTreeList.length > 0) {
+ if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
this.$message.warning('必须选择维护机构')
return
} else {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0ced92b..4dd59cd 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -280,6 +280,7 @@
},
qu(val) { // 监控区变化
if (val !== '') {
+ this.wellForm.area = ''
this.fetchArea2()
}
}
@@ -375,7 +376,7 @@
}
// 如果责任部门不选,则用权属作为责任部门
if (this.wellForm.responsibleDept === '') {
- if (this.secondDeptTreeList.length > 0) {
+ if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
this.$message.warning('必须选择维护机构')
return
} else {
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 38f9d85..1678fb0 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -117,7 +117,7 @@
-
+
@@ -197,7 +197,7 @@
value: 'installDate'
},
{
- text: '实时数据',
+ text: '最新数据',
value: 'data',
width: 80
},
@@ -287,8 +287,6 @@
this.quList = response.data
})
}
- }).catch((res) => {
- // this.$message.error(res.message)
})
},
// 获取区域2
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0ced92b..4dd59cd 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -280,6 +280,7 @@
},
qu(val) { // 监控区变化
if (val !== '') {
+ this.wellForm.area = ''
this.fetchArea2()
}
}
@@ -375,7 +376,7 @@
}
// 如果责任部门不选,则用权属作为责任部门
if (this.wellForm.responsibleDept === '') {
- if (this.secondDeptTreeList.length > 0) {
+ if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
this.$message.warning('必须选择维护机构')
return
} else {
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 38f9d85..1678fb0 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -117,7 +117,7 @@
-
+
@@ -197,7 +197,7 @@
value: 'installDate'
},
{
- text: '实时数据',
+ text: '最新数据',
value: 'data',
width: 80
},
@@ -287,8 +287,6 @@
this.quList = response.data
})
}
- }).catch((res) => {
- // this.$message.error(res.message)
})
},
// 获取区域2
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 61bee7f..7de979e 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -28,7 +28,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
-
+
@@ -264,11 +264,21 @@
}
},
watch: {
- firstDept(val) { // 监控权属单位变化
- if (val !== '') {
- this.wellForm.responsibleDept = ''
- this.fetchSecondDeptTree()
- this.fetchArea1()
+ firstDept(val, oldVal) { // 监控权属单位变化
+ if (oldVal !== '') {
+ if (val !== '') {
+ this.wellForm.responsibleDept = ''
+ this.wellForm.responsibleDeptName = ''
+ this.wellForm.area = ''
+ this.wellForm.qu = ''
+ this.fetchSecondDeptTree()
+ this.fetchArea1()
+ }
+ } else {
+ if (val !== '') {
+ this.fetchSecondDeptTree()
+ this.fetchArea1()
+ }
}
},
qu(val) { // 监控区变化
@@ -360,6 +370,17 @@
}
})
},
+ // 改变权属单位选项时
+ deptChanged() {
+ console.log('deptChanged')
+ this.wellForm.responsibleDept = ''
+ this.wellForm.area = ''
+ this.wellForm.qu = ''
+ },
+ // 改变区选项时的操作
+ quChanged() {
+ this.wellForm.area = ''
+ },
// 获取区域2
fetchArea2() {
getAreaList(this.wellForm.qu).then(response => {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0ced92b..4dd59cd 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -280,6 +280,7 @@
},
qu(val) { // 监控区变化
if (val !== '') {
+ this.wellForm.area = ''
this.fetchArea2()
}
}
@@ -375,7 +376,7 @@
}
// 如果责任部门不选,则用权属作为责任部门
if (this.wellForm.responsibleDept === '') {
- if (this.secondDeptTreeList.length > 0) {
+ if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
this.$message.warning('必须选择维护机构')
return
} else {
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 38f9d85..1678fb0 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -117,7 +117,7 @@
-
+
@@ -197,7 +197,7 @@
value: 'installDate'
},
{
- text: '实时数据',
+ text: '最新数据',
value: 'data',
width: 80
},
@@ -287,8 +287,6 @@
this.quList = response.data
})
}
- }).catch((res) => {
- // this.$message.error(res.message)
})
},
// 获取区域2
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 61bee7f..7de979e 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -28,7 +28,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
-
+
@@ -264,11 +264,21 @@
}
},
watch: {
- firstDept(val) { // 监控权属单位变化
- if (val !== '') {
- this.wellForm.responsibleDept = ''
- this.fetchSecondDeptTree()
- this.fetchArea1()
+ firstDept(val, oldVal) { // 监控权属单位变化
+ if (oldVal !== '') {
+ if (val !== '') {
+ this.wellForm.responsibleDept = ''
+ this.wellForm.responsibleDeptName = ''
+ this.wellForm.area = ''
+ this.wellForm.qu = ''
+ this.fetchSecondDeptTree()
+ this.fetchArea1()
+ }
+ } else {
+ if (val !== '') {
+ this.fetchSecondDeptTree()
+ this.fetchArea1()
+ }
}
},
qu(val) { // 监控区变化
@@ -360,6 +370,17 @@
}
})
},
+ // 改变权属单位选项时
+ deptChanged() {
+ console.log('deptChanged')
+ this.wellForm.responsibleDept = ''
+ this.wellForm.area = ''
+ this.wellForm.qu = ''
+ },
+ // 改变区选项时的操作
+ quChanged() {
+ this.wellForm.area = ''
+ },
// 获取区域2
fetchArea2() {
getAreaList(this.wellForm.qu).then(response => {
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index c3e9b38..164ee1a 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -86,8 +86,8 @@
@current-change="handleCurrentChange"/>
-
-
+
+
@@ -278,7 +278,6 @@
}
}).catch(err => {
loading.close()
- this.$message.error(err.message)
})
this.fileList = []
},
@@ -305,7 +304,7 @@
window.URL.revokeObjectURL(href) // 释放blob对象
}).catch((res) => {
loading.close()
- this.$message.error(res.message)
+ debugger
})
},
// 布防撤防