@@ -201,14 +203,16 @@
import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
import editEquipment from '@/views/rain/inspection/components/editEquipment'
- import editSite from '@/views/rain/inspection/components/editSite'
+ import editSite from '@/views/rain/inspection/components/editSite'
+ import mapShow from '@/views/rain/inspection/components/mapShow'
export default {
components: {
LxHeader,
showRainEquipmentInfo,
showRainSiteInfo,
editEquipment,
- editSite
+ editSite,
+ mapShow
},
data() {
return {
@@ -407,6 +411,10 @@
}
},
methods: {
+ showMap(){
+ this.$refs.mapShow.isShow = true
+ this.$refs.mapShow.getMap()
+ },
initLoad() {
var that = this;
var clientHeight = document.documentElement.clientHeight
@@ -511,10 +519,12 @@
var that = this
this.rainTypeVisible = false
if (that.rainType == 1) {
+ this.$refs.editEquipment.infoId = ""
this.$refs.editEquipment.getEquipmentInfo()
this.$refs.editEquipment.isShow = true
} else if (that.rainType == 2) {
+ this.$refs.editSite.infoId = ""
this.$refs.editSite.getSiteInfo()
this.$refs.editSite.isShow = true
}
@@ -523,6 +533,13 @@
this.rainTypeVisible = false
this.rainType = 1
},
+
+ showMapInfo(arr){
+ console.log(arr)
+ let obj = arr[0]
+ let type = arr[1]
+ this.showInfo(obj,type)
+ },
// 审核 办结 查看
showInfo(obj, formtype) {
// 日常雨水设施
diff --git a/src/views/rain/inspection/maps.vue b/src/views/rain/inspection/maps.vue
new file mode 100644
index 0000000..b889a1f
--- /dev/null
+++ b/src/views/rain/inspection/maps.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/rain/maintain/components/editCirculation.vue b/src/views/rain/maintain/components/editCirculation.vue
index 58d1c32..bdff5fb 100644
--- a/src/views/rain/maintain/components/editCirculation.vue
+++ b/src/views/rain/maintain/components/editCirculation.vue
@@ -167,7 +167,7 @@
return {
formType: "showform", // 审核：auditform 办结 endform 查看 showform
title: "雨管养护",
- rainType: 1, //新增哪个
+ rainType: "", //新增哪个
width: "60%",
labelwidth: "120px",
isShow: false,
@@ -231,9 +231,21 @@
this.infoId = val
},
rainType(val) {
- var that = this
- this.rainType = val
- this.form.type = val
+ var that = this
+ if(val){
+ that.rainType = val
+ that.form.type = val
+ for (var m of that.yhtypeList) {
+ if (m.id == val) {
+ that.title = m.name
+ }
+ }
+ }else{
+ that.rainType = 1
+ that.form.type = 1
+ that.title = "雨水管道疏挖"
+ }
+
},
mapform(newVal, oldVal) {
this.form.longitude = newVal[0];
@@ -370,7 +382,6 @@
this.form.files_deal_list = listUrlafter
that.form.title_id = this.returnTitleId(that.titleArr)
console.log("that.form", that.form)
- // return
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitType(this.rainType)
diff --git a/src/views/rain/maintain/components/editMire.vue b/src/views/rain/maintain/components/editMire.vue
index 579b500..d1563d7 100644
--- a/src/views/rain/maintain/components/editMire.vue
+++ b/src/views/rain/maintain/components/editMire.vue
@@ -127,13 +127,13 @@
infoId(val) {
this.infoId = val
},
- mapform(newVal, oldVal) {
- this.form.longitude = newVal[0];
- this.form.latitude = newVal[1];
- // if(this.rainType!=4){
- this.form.address = newVal[2];
- // }
- },
+ // mapform(newVal, oldVal) {
+ // this.form.longitude = newVal[0];
+ // this.form.latitude = newVal[1];
+ // // if(this.rainType!=4){
+ // this.form.address = newVal[2];
+ // // }
+ // },
},
created() {
@@ -225,8 +225,8 @@
that.filesList = [];
that.roadName = ""
that.roaddisabled = false
- that.mapform = ['', '', ''];
- this.form = {
+ this.form = {
+ type:4
}
},
chooseRoad(val) {
diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue
index 0e7308e..4132465 100644
--- a/src/views/rain/maintain/maintain.vue
+++ b/src/views/rain/maintain/maintain.vue
@@ -584,12 +584,14 @@
var that = this
this.rainTypeVisible = false
if (that.rainType == 1 || that.rainType == 2 || that.rainType == 3 || that.rainType == 5 || that.rainType ==
- 6 || that.rainType ==
- 7) {
+ 6 || that.rainType == 7) {
+ console.log("a",that.rainType)
+ this.$refs.editCirculation.infoId = ""
this.$refs.editCirculation.rainType = that.rainType
this.$refs.editCirculation.getInfo()
this.$refs.editCirculation.isShow = true
} else if (that.rainType == 4) {
+ this.$refs.editMire.infoId = ""
this.$refs.editMire.getInfo()
this.$refs.editMire.isShow = true
}
diff --git a/src/views/rain/order/check.vue b/src/views/rain/order/check.vue
index 31a7624..568abf7 100644
--- a/src/views/rain/order/check.vue
+++ b/src/views/rain/order/check.vue
@@ -114,10 +114,10 @@
-
-
+
-
-->
+
@@ -195,7 +195,8 @@
},
tableList: {
rain_inspection_info: {},
- worksheet_info: {}
+ worksheet_info: {},
+ rain_maintain_info:{}
},
rainEquipmentInfo: {},
acceptTime: "",
@@ -454,21 +455,22 @@
// }
if (obj.rain_maintain_id > 0) {
- this.$refs.maintain.dialogFormDetailVisible = true
- // this.showinfo = true
- this.$refs.maintain.info(obj.rain_maintain_id)
- return
- if (obj.old_type == 1 || obj.old_type == 2 || obj.old_type == 6 || obj.old_type == 7 || obj.old_type == 5) {
+ // this.$refs.maintain.dialogFormDetailVisible = true
+ // // this.showinfo = true
+ // this.$refs.maintain.info(obj.rain_maintain_id)
+ // return
+ let oldType = obj.rain_maintain_info?obj.rain_maintain_info.old_type:0
+ if (oldType == 1 || oldType == 2 || oldType == 6 || oldType == 7 || oldType == 5) {
this.$refs.showCirculationInfo.isShow = true
this.$refs.showCirculationInfo.infoId = obj.rain_maintain_id
this.$refs.showCirculationInfo.formType = 'showform'
this.$refs.showCirculationInfo.getInfo(obj.rain_maintain_id)
- } else if (obj.old_type == 3) {
+ } else if (oldType == 3) {
this.$refs.showDischargeInfo.isShow = true
this.$refs.showDischargeInfo.infoId = obj.rain_maintain_id
this.$refs.showDischargeInfo.formType = 'showform'
this.$refs.showDischargeInfo.getInfo(obj.rain_maintain_id)
- } else if (obj.old_type == 4) {
+ } else if (oldType == 4) {
this.$refs.showMireInfo.isShow = true
this.$refs.showMireInfo.infoId = obj.rain_maintain_id
this.$refs.showMireInfo.formType = 'showform'
diff --git a/src/views/rain/order/components/maintainInfo.vue b/src/views/rain/order/components/maintainInfo.vue
deleted file mode 100644
index ffe8832..0000000
--- a/src/views/rain/order/components/maintainInfo.vue
+++ /dev/null
@@ -1,799 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{roadName}}
-
-
-
-
- {{form.title_detail}}
-
-
-
-
-
- {{form.number}}
-
-
-
-
-
- {{form.address}}
-
-
-
-
- {{form.longitude}}
-
-
-
-
- {{form.latitude}}
-
-
-
-
- {{form.content}}
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/rain/order/send.vue b/src/views/rain/order/send.vue
index 45faf61..437af65 100644
--- a/src/views/rain/order/send.vue
+++ b/src/views/rain/order/send.vue
@@ -338,13 +338,14 @@
![]()
-
-
-
+
+
+
+