diff --git a/src/components/dialogShow/index.vue b/src/components/dialogShow/index.vue
new file mode 100644
index 0000000..76b1032
--- /dev/null
+++ b/src/components/dialogShow/index.vue
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/common/index.vue b/src/views/common/index.vue
index d5ce04d..57567d3 100644
--- a/src/views/common/index.vue
+++ b/src/views/common/index.vue
@@ -80,13 +80,13 @@
-
+
@@ -183,13 +183,13 @@
-
+
@@ -403,7 +403,7 @@
files_list: [],
type: "",
},
- roadName: "",
+ // roadName: "",
form: {
feedback_department_id: "",
ask_type_id: "",
@@ -627,7 +627,7 @@
// that.form = result;
that.mapform = [result.longitude, result.latitude, result.address]
- that.roadName = result.road ? result.road.name : ""
+ // that.roadName = result.road ? result.road.name : ""
let _files = [];
for (var mod of result.common_inspection_files) {
let m = Object.assign({}, mod);
diff --git a/src/views/rain/inspection/components/showRainEquipmentInfo.vue b/src/views/rain/inspection/components/showRainEquipmentInfo.vue
new file mode 100644
index 0000000..2ca9d84
--- /dev/null
+++ b/src/views/rain/inspection/components/showRainEquipmentInfo.vue
@@ -0,0 +1,346 @@
+
+
+
+
+
+
+
+
+ {{form.roadName}}
+
+
+
+
+ {{form.ask_content_detail?form.ask_content_detail:""}}
+
+
+
+
+ {{form.address}}
+
+
+
+
+ {{form.longitude}}
+
+
+
+
+ {{form.latitude}}
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+ {{form.start_address?form.start_address:""}}
+
+
+
+
+ {{form.end_address?form.end_address:""}}
+
+
+
+
+ {{form.unusual_type_detail?form.unusual_type_detail.value:""}}
+
+
+
+
+ {{form.tip}}
+
+
+
+
+ 否
+ 是
+
+
+
+
+ {{form.result}}
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+
+
+
+
+
+ {{form.end_time}}
+
+
+
+
+ {{form.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核
+
+ 办结
+
+ 保存
+
+ 退回
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/rain/inspection/components/showRainSiteInfo.vue b/src/views/rain/inspection/components/showRainSiteInfo.vue
new file mode 100644
index 0000000..cc611e4
--- /dev/null
+++ b/src/views/rain/inspection/components/showRainSiteInfo.vue
@@ -0,0 +1,379 @@
+
+
+
+
+
+
+
+
+ {{form.roadName}}
+
+
+
+
+ {{form.name}}
+
+
+
+
+ {{form.address}}
+
+
+
+
+ {{form.longitude}}
+
+
+
+
+ {{form.latitude}}
+
+
+
+
+ {{form.number}}
+
+
+
+
+ {{form.build_unit}}
+
+
+
+
+ {{form.carry_unit}}
+
+
+
+
+
+
+
+
+
+
+ {{item.value}}
+
+
+
+
+
+ {{form.siteRemark}}
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+ {{form.content}}
+
+
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+
+
+
+
+
+ {{form.end_time}}
+
+
+
+
+ {{form.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核
+
+ 办结
+
+ 保存
+
+ 退回
+
+
+
+
+
+
+
+
+
diff --git a/src/views/rain/inspection/inspection copy.vue b/src/views/rain/inspection/inspection copy.vue
new file mode 100644
index 0000000..b30295a
--- /dev/null
+++ b/src/views/rain/inspection/inspection copy.vue
@@ -0,0 +1,1840 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 日常雨水设施
+ 在建工地巡查
+
+
+ 有
+ 无
+
+
+ 待审核
+ 已审核
+ 已办结
+ 已退回
+
+
+ 待复核
+ 已复核
+
+
+
+ 无
+
+
+ {{scope.row[column.field]?scope.row[column.field].name:""}}
+
+
+
+ {{getUserName(scope.row)}}
+
+
+ {{scope.row[column.field]}}
+
+
+
+
+
+
+
+ 日常雨水设施
+ 在建工地
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{roadName}}
+
+
+
+
+
+
+
+
+
+
+ {{form.address}}
+
+
+
+
+ {{form.longitude}}
+
+
+
+
+ {{form.latitude}}
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+ {{form.start_address}}
+
+
+
+
+ {{form.end_address}}
+
+
+
+
+ {{form.unusual_type_detail?form.unusual_type_detail.value:""}}
+
+
+
+
+ {{form.tip}}
+
+
+
+
+ 否
+ 是
+
+
+
+
+ {{form.result}}
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+ {{formdetail.end_time}}
+
+
+
+
+ {{formdetail.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{roadName}}
+
+
+
+
+ {{form.name}}
+
+
+
+
+ {{form.address}}
+
+
+
+
+ {{form.longitude}}
+
+
+
+
+ {{form.latitude}}
+
+
+
+
+ {{form.number}}
+
+
+
+
+ {{form.build_unit}}
+
+
+
+
+ {{form.carry_unit}}
+
+
+
+
+
+
+
+
+
+
+ {{item.value}}
+
+
+
+
+
+
+ {{form.remark}}
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+
+ {{form.content}}
+
+
+
+
+
+
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无
+ 养护转办
+ 违法转办
+
+
+
+
+ {{formdetail.end_time}}
+
+
+
+
+ {{formdetail.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.value}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/rain/inspection/inspection.vue b/src/views/rain/inspection/inspection.vue
index b6b8fca..65dc024 100644
--- a/src/views/rain/inspection/inspection.vue
+++ b/src/views/rain/inspection/inspection.vue
@@ -6,10 +6,10 @@
-
-
+
+
@@ -20,10 +20,10 @@
-
-
-
-
+
+
+
+
@@ -41,11 +41,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -59,15 +59,16 @@
:label="column.title" :width="column.width" :fixed="column.fixed">
-
-
+
+
+ @click="showInfo(scope.row,'endform')" type="primary" style="margin-left: 10px;">办结
@@ -128,416 +129,6 @@
-
-
-
-
-
-
-
-
-
- {{roadName}}
-
-
-
-
-
-
-
-
-
-
- {{form.address}}
-
-
-
-
- {{form.longitude}}
-
-
-
-
- {{form.latitude}}
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
- 否
- 是
-
-
-
-
-
-
- {{form.start_address}}
-
-
-
-
- {{form.end_address}}
-
-
-
-
- {{form.unusual_type_detail?form.unusual_type_detail.value:""}}
-
-
-
-
- {{form.tip}}
-
-
-
-
- 否
- 是
-
-
-
-
- {{form.result}}
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 无
- 养护转办
- 违法转办
-
-
-
-
-
- 无
- 养护转办
- 违法转办
-
-
-
-
- {{formdetail.end_time}}
-
-
-
-
- {{formdetail.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{roadName}}
-
-
-
-
- {{form.name}}
-
-
-
-
- {{form.address}}
-
-
-
-
- {{form.longitude}}
-
-
-
-
- {{form.latitude}}
-
-
-
-
- {{form.number}}
-
-
-
-
- {{form.build_unit}}
-
-
-
-
- {{form.carry_unit}}
-
-
-
-
-
-
-
-
-
-
- {{item.value}}
-
-
-
-
-
-
- {{form.remark}}
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
- 否
- 是
-
-
-
-
-
-
-
-
-
-
- {{form.content}}
-
-
-
-
-
-
-
-
-
-
-
- 无
- 养护转办
- 违法转办
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 无
- 养护转办
- 违法转办
-
-
-
-
- {{formdetail.end_time}}
-
-
-
-
- {{formdetail.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -559,7 +150,7 @@
-
+
@@ -593,7 +184,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -736,16 +327,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -808,11 +399,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -870,9 +461,9 @@
-
-
-
+
+
+
@@ -906,11 +497,14 @@
} from '../../../api/basic/road.js'
import LxHeader from "@/components/LxHeader/index.vue";
import AvueMap from 'avue-plugin-map'
-
+ import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
+ import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
export default {
components: {
LxHeader,
- AvueMap
+ AvueMap,
+ showRainEquipmentInfo,
+ showRainSiteInfo
},
data() {
return {
@@ -939,15 +533,15 @@
dialogVisible: false,
rainTitle: "日常雨水设施",
tableData: [],
- mapparams: {
- zoom: 11,
- },
- mapform: [],
- start_mapform: [],
+ mapparams: {
+ zoom: 11,
+ },
+ mapform: [],
+ start_mapform: [],
end_mapform: [],
tableHeight: 0,
- searchFields: {
- is_export:0
+ searchFields: {
+ is_export: 0
// area_id: "",
// type:"",
// status:"",
@@ -956,34 +550,35 @@
// end_date:"",
// road_id:"",
// ask_content_id:""
- },
- unusualList:[],
-yhtypeList: [{
- id: 1,
- name: "雨水管道疏挖"
- }, {
- id: 2,
- name: "雨水管道疏通"
- },{
- id: 3,
- name: "汛期助排"
- },{
- id: 4,
- name: "污泥外运"
- },{
- id: 5,
- name: "出水口排查"
- },{
- id: 6,
- name: "专项处理"
- },{
- id: 7,
- name: "维修"
+ },
+ unusualList: [],
+ askContentArr:[],
+ yhtypeList: [{
+ id: 1,
+ name: "雨水管道疏挖"
+ }, {
+ id: 2,
+ name: "雨水管道疏通"
+ }, {
+ id: 3,
+ name: "汛期助排"
+ }, {
+ id: 4,
+ name: "污泥外运"
+ }, {
+ id: 5,
+ name: "出水口排查"
+ }, {
+ id: 6,
+ name: "专项处理"
+ }, {
+ id: 7,
+ name: "维修"
}],
- selects: {
- sunusualList:[{
- id:"",
- value:"所有"
+ selects: {
+ sunusualList: [{
+ id: "",
+ value: "所有"
}],
areasList: [{
id: "",
@@ -1030,8 +625,8 @@ yhtypeList: [{
page: 1,
page_size: 15,
total: 0
- },
- baseurl:"",
+ },
+ baseurl: "",
filesList: [],
dealFilesList: [],
rainMaintainLogs: [],
@@ -1045,10 +640,10 @@ yhtypeList: [{
buildList: [],
siteType: [],
siteLaw: [],
- equiementList: [],
- sequiementList:[{
- id:"",
- value:"所有"
+ equiementList: [],
+ sequiementList: [{
+ id: "",
+ value: "所有"
}],
siteStatus: [{
id: 1,
@@ -1060,8 +655,8 @@ yhtypeList: [{
form: {
content: "",
ask_content_id: "",
- is_unusual: 0,
- unusual_type_id:"",
+ is_unusual: 0,
+ unusual_type_id: "",
is_scene: 0,
// point_name: "",
@@ -1081,9 +676,9 @@ yhtypeList: [{
remark: "",
is_law: 0,
break_id: "",
- road_id: "",
- carry_unit:"",
- build_unit:""
+ road_id: "",
+ carry_unit: "",
+ build_unit: ""
},
roadsList: [],
roadName: "",
@@ -1098,16 +693,16 @@ yhtypeList: [{
remark: ''
},
- rules: {
- // scope: [{
- // required: true,
- // message: '请填写覆盖范围',
- // trigger: 'blur',
- // }],
- // point_name: [{
- // required: true,
- // message: '请填写点位名称',
- // trigger: 'blur',
+ rules: {
+ // scope: [{
+ // required: true,
+ // message: '请填写覆盖范围',
+ // trigger: 'blur',
+ // }],
+ // point_name: [{
+ // required: true,
+ // message: '请填写点位名称',
+ // trigger: 'blur',
// }],
// content: [{
// required: true,
@@ -1202,20 +797,20 @@ yhtypeList: [{
// if(this.rainType!=4){
this.form.address = newVal[2];
// }
- },
- start_mapform(newVal, oldVal) {
- this.form.start_longitude = newVal[0];
- this.form.start_latitude = newVal[1];
- // if(this.rainType!=4){
- this.form.start_address = newVal[2];
- // }
- },
- end_mapform(newVal, oldVal) {
- this.form.end_longitude = newVal[0];
- this.form.end_latitude = newVal[1];
- // if(this.rainType!=4){
- this.form.end_address = newVal[2];
- // }
+ },
+ start_mapform(newVal, oldVal) {
+ this.form.start_longitude = newVal[0];
+ this.form.start_latitude = newVal[1];
+ // if(this.rainType!=4){
+ this.form.start_address = newVal[2];
+ // }
+ },
+ end_mapform(newVal, oldVal) {
+ this.form.end_longitude = newVal[0];
+ this.form.end_latitude = newVal[1];
+ // if(this.rainType!=4){
+ this.form.end_address = newVal[2];
+ // }
},
rainType() {
this.roadsList = []
@@ -1229,17 +824,17 @@ yhtypeList: [{
this.searchFields.end_date = ""
}
- },
-
- 'form.is_unusual':function(val){
- if(val==1){
- this.start_mapform=[]
- this.end_mapform=[]
- }
- if(val==0){
- this.form.unusual_type_id=""
- this.form.tip=""
- }
+ },
+
+ 'form.is_unusual': function(val) {
+ if (val == 1) {
+ this.start_mapform = []
+ this.end_mapform = []
+ }
+ if (val == 0) {
+ this.form.unusual_type_id = ""
+ this.form.tip = ""
+ }
}
},
methods: {
@@ -1256,6 +851,17 @@ yhtypeList: [{
handleSelectionChange(val) {
console.log(val)
this.reviewList = val
+ },
+ returnAskContentId(arr){
+ if(arr.length==0){
+ return
+ }
+ let getArr = ""
+ for(var m of arr){
+ getArr+= m+","
+ }
+ getArr = getArr.substring(0,getArr.length-1)
+ return getArr
},
review() {
let data = this.reviewList
@@ -1314,14 +920,14 @@ yhtypeList: [{
buildchange(val) {
if (Object.prototype.toString.call(val) != '[object Object]') {
this.mapform = ['', '', ''];
- this.$refs['form'].resetFields();
- this.form.name = val
- this.form.type = ""
+ this.$refs['form'].resetFields();
+ this.form.name = val
+ this.form.type = ""
let timeNumber = new Date().getTime()
this.form.number = timeNumber
}
- if (Object.prototype.toString.call(val) === '[object Object]') {
+ if (Object.prototype.toString.call(val) === '[object Object]') {
console.log(val)
this.mapform = [val.longitude, val.latitude, val.address]
this.form.longitude = val.longitude
@@ -1332,8 +938,8 @@ yhtypeList: [{
this.form.status = val.status
this.form.remark = val.remark
this.form.building_site_id = val.id
- this.form.name = val.name
- this.form.build_unit = val.build_unit
+ this.form.name = val.name
+ this.form.build_unit = val.build_unit
this.form.carry_unit = val.carry_unit
}
@@ -1358,16 +964,16 @@ yhtypeList: [{
that.siteLaw = res.detail
})
getparameteritem('equiementList').then(res => {
- that.equiementList = res.detail
- for(var m of res.detail){
- that.sequiementList.push(m)
+ that.equiementList = res.detail
+ for (var m of res.detail) {
+ that.sequiementList.push(m)
+ }
+ })
+ getparameteritem('unusualList').then(res => {
+ that.unusualList = res.detail
+ for (var m of res.detail) {
+ that.selects.sunusualList.push(m)
}
- })
- getparameteritem('unusualList').then(res => {
- that.unusualList = res.detail
- for(var m of res.detail){
- that.selects.sunusualList.push(m)
- }
})
getbuilding().then(res => {
@@ -1391,34 +997,35 @@ yhtypeList: [{
handleCurrentChange(page) {
this.paginations.page = page;
this.load();
- },
- exportExcel(){
- var that = this
- that.searchFields.is_export = 1
- that.load(true)
},
- load(is_export) {
+ exportExcel() {
+ var that = this
+ that.searchFields.is_export = 1
+ that.load(true)
+ },
+ load(is_export) {
+ // return
listall({
page: this.paginations.page,
page_size: this.paginations.page_size,
...this.searchFields
- }).then(response => {
- let tokens = getToken();
- if (is_export) {
- var url = "/api/admin/rain-maintains/index?token=" + tokens
- for (var m in this.searchFields) {
- url += "&" + m + "=" + this.searchFields[m]
- }
- url = this.baseurl + url
- console.log(url)
- window.open("http://" + url, '_blank')
- this.searchFields.is_export = 0
- return;
+ }).then(response => {
+ let tokens = getToken();
+ if (is_export) {
+ var url = "/api/admin/rain-maintains/index?token=" + tokens
+ for (var m in this.searchFields) {
+ url += "&" + m + "=" + this.searchFields[m]
+ }
+ url = this.baseurl + url
+ console.log(url)
+ window.open("http://" + url, '_blank')
+ this.searchFields.is_export = 0
+ return;
}
for (var m of response.data) {
if (m.rain_equipment_info) {
m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail
- .value : ""
+ : ""
}
}
this.tableData = response.data;
@@ -1455,18 +1062,26 @@ yhtypeList: [{
case 1:
that.form = result.rain_equipment_info;
that.form.rain_equipment_id = result.rain_equipment_id;
- that.roaddisabled = true
- that.form.ask_content_id =result.rain_equipment_info.ask_content_id?parseInt(result.rain_equipment_info.ask_content_id):""
+ that.roaddisabled = true
+ that.form.ask_content_id = result.rain_equipment_info.ask_content_id ? result
+ .rain_equipment_info.ask_content_id : ""
+ let askArr = result.rain_equipment_info.ask_content_id ? result.rain_equipment_info.ask_content_id.split(","):[]
+ for(var m of askArr){
+ that.askContentArr.push(parseInt(m))
+ }
+
that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
that.idname = "rain_equipment_id"
that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result
.rain_equipment_info.address
- ]
- if(result.rain_equipment_info.is_unusual==0){
- that.start_mapform = [result.rain_equipment_info.start_longitude, result.rain_equipment_info.start_latitude, result.rain_equipment_info.start_address
- ]
- that.end_mapform = [result.rain_equipment_info.end_longitude, result.rain_equipment_info.end_latitude, result.rain_equipment_info.end_address
- ]
+ ]
+ if (result.rain_equipment_info.is_unusual == 0) {
+ that.start_mapform = [result.rain_equipment_info.start_longitude, result.rain_equipment_info
+ .start_latitude, result.rain_equipment_info.start_address
+ ]
+ that.end_mapform = [result.rain_equipment_info.end_longitude, result.rain_equipment_info
+ .end_latitude, result.rain_equipment_info.end_address
+ ]
}
let _files = [];
for (var mod of result.rain_equipment_info.rain_equipment_files) {
@@ -1488,7 +1103,7 @@ yhtypeList: [{
}
that.dealFilesList = _filesafter;
break;
- case 2:
+ case 2:
that.roaddisabled = true
that.form = result.building_site_info;
that.roadName = result.building_site_info.road ? result.building_site_info.road.name : ""
@@ -1500,8 +1115,8 @@ yhtypeList: [{
that.form.name = building_site.name
that.form.number = building_site.number
that.form.remark = building_site.remark
- that.form.status = building_site.status
- that.form.build_unit = building_site.build_unit
+ that.form.status = building_site.status
+ that.form.build_unit = building_site.build_unit
that.form.carry_unit = building_site.carry_unit
that.form.type = parseInt(building_site.type)
that.form.building_site_id = building_site.id
@@ -1534,20 +1149,40 @@ yhtypeList: [{
},
show(obj) {
- this.dialogFormDetailVisible = true;
+ this.dialogFormDetailVisible = true;
+ // this.$refs.showRainEquipmentInfo.isShow = true
this.info(obj)
- },
+ },
+// 审核 办结 查看
+ showInfo(obj,formtype){
+ // 日常雨水设施
+ if(obj.type==1){
+ this.$refs.showRainEquipmentInfo.isShow = true
+ this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.id)
+ this.$refs.showRainEquipmentInfo.infoId = obj.id
+ this.$refs.showRainEquipmentInfo.formType = formtype
+ }
+ // 工地
+ if(obj.type==2){
+ this.$refs.showRainSiteInfo.isShow = true
+ this.$refs.showRainSiteInfo.getSiteInfo(obj.id)
+ this.$refs.showRainSiteInfo.infoId = obj.id
+ this.$refs.showRainSiteInfo.formType = formtype
+ }
+
+ },
edit(obj) {
var that = this;
this.form = this.$options.data().form
that.filesList = [];
that.dealFilesList = [];
- that.mapform = ['', '', ''];
- that.start_mapform = ['', '', ''];
+ that.mapform = ['', '', ''];
+ that.start_mapform = ['', '', ''];
that.end_mapform = ['', '', ''];
- that.roadName = ""
- that.roaddisabled = false
+ that.roadName = ""
+ that.roaddisabled = false
+ that.askContentArr=[]
if (obj) {
that.info(obj);
this.dialogFormVisible = true;
@@ -1605,7 +1240,8 @@ yhtypeList: [{
"upload_id": m.upload_id
});
}
- this.form.files_end_list = listUrlafter
+ this.form.files_end_list = listUrlafter
+ that.form.ask_content_id = this.returnAskContentId(that.askContentArr)
this.$refs[formName].validate((valid) => {
if (valid) {
that.submitAll(that.rainType, that.form[this.idname])
@@ -1616,50 +1252,17 @@ yhtypeList: [{
}
});
},
- submitFormDetail(formName, status) {
- var that = this;
- that.formdetail.status = status
- console.log(that.formdetail);
- update(that.formdetail).then(response => {
- this.$Message.success('操作成功');
- that.load();
- that.dialogFormDetailVisible = false;
- }).catch(error => {
- //reject(error)
- })
-
- },
resetForm(formName) {
var that = this;
that.filesList = [];
that.dealFilesList = [];
- that.mapform = ['', '', ''];
- that.start_mapform = ['', '', ''];
+ that.mapform = ['', '', ''];
+ that.start_mapform = ['', '', ''];
that.end_mapform = ['', '', ''];
this.$refs[formName].resetFields();
that.dialogFormVisible = false;
that.dialogFormDetailVisible = false;
},
- resetFormDetail(formName) {
- var that = this;
- that.filesList = [];
- that.dealFilesList = [];
- that.mapform = ['', '', ''];
- that.start_mapform = ['', '', ''];
- that.end_mapform = ['', '', ''];
- that.form = {};
- that.rainMaintainLogs = []
- that.end_types = 0;
- that.formdetail = {
- status: 0,
- end_type: 0,
- content: "",
- end_time: "",
- remark: ""
- }
- that.dialogFormVisible = false;
- that.dialogFormDetailVisible = false;
- },
handleRemove(file) {
if (file.photoType == "before") {
for (var i = 0; i < this.filesList.length; i++) {
@@ -1721,7 +1324,7 @@ yhtypeList: [{
// return
// that.form.type = type;
console.log("that.form", that.form);
- // return;
+ // return
switch (parseInt(type)) {
case 1:
if (id) {
@@ -1789,12 +1392,13 @@ yhtypeList: [{
display: none;
}
- .vm10{
- margin-right:10px;
- margin-bottom:10px;
- height: 32px;
- vertical-align: bottom;
+ .vm10 {
+ margin-right: 10px;
+ margin-bottom: 10px;
+ height: 32px;
+ vertical-align: bottom;
}
+
.vm10 input {
height: 32px;
vertical-align: middle;
@@ -1802,11 +1406,14 @@ yhtypeList: [{
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
- }
- .vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
- line-height: 25px;
- }
- .selerchcontent button{
- vertical-align: top;
+ }
+
+ .vm10 .el-input__icon.el-range__icon.el-icon-date,
+ .vm10 .el-range-separator {
+ line-height: 25px;
+ }
+
+ .selerchcontent button {
+ vertical-align: top;
}
diff --git a/src/views/rain/maintain/components/showCirculationInfo.vue b/src/views/rain/maintain/components/showCirculationInfo.vue
new file mode 100644
index 0000000..a8bdc29
--- /dev/null
+++ b/src/views/rain/maintain/components/showCirculationInfo.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue
index 6ecf3b8..91da426 100644
--- a/src/views/rain/maintain/maintain.vue
+++ b/src/views/rain/maintain/maintain.vue
@@ -611,7 +611,7 @@
-
+
@@ -1141,7 +1141,7 @@
remark:""
},
wf_type: 0,
-
+titleArr:[],
rules: {
// scope: [{
// required: true,
@@ -1451,7 +1451,11 @@
that.idname = "circulation_id"
that.mapform = [result.circulation_info.longitude, result.circulation_info.latitude, result
.circulation_info.address
- ]
+ ]
+ let cir_arrs = result.circulation_info.title_id ? result.circulation_info.title_id.split(","):[]
+ for(var m of cir_arrs){
+ that.titleArr.push(parseInt(m))
+ }
let _files = [];
for (var mod of result.circulation_info.circulation_files) {
let m = Object.assign({}, mod);
@@ -1526,7 +1530,11 @@
that.roadName = result.out_water_info.road ? result.out_water_info.road.name : ""
that.mapform = [result.out_water_info.longitude, result.out_water_info.latitude, result.out_water_info
.address
- ]
+ ]
+ let water_arrs = result.circulation_info.title_id ? result.circulation_info.title_id.split(","):[]
+ for(var m of water_arrs){
+ that.titleArr.push(parseInt(m))
+ }
let water_files = [];
for (var mod of result.out_water_info.out_water_files) {
let m = Object.assign({}, mod);
@@ -1566,6 +1574,7 @@
that.dealFilesList = [];
that.mapform = ['', '', ''];
that.roadName = ""
+ that.titleArr = []
that.roaddisabled = false
if (obj) {
that.info(obj);
@@ -1596,7 +1605,17 @@
});
}
},
-
+ returnTitleId(arr){
+ if(arr.length==0){
+ return
+ }
+ let getArr = ""
+ for(var m of arr){
+ getArr+= m+","
+ }
+ getArr = getArr.substring(0,getArr.length-1)
+ return getArr
+ },
submitForm(formName) {
var that = this;
var listUrlbefore = []
@@ -1622,8 +1641,10 @@
listUrlafter.push({
"upload_id": m.upload_id
});
- }
- this.form.files_deal_list = listUrlafter
+ }
+
+ this.form.files_deal_list = listUrlafter
+ that.form.title_id = this.returnTitleId(that.titleArr)
this.$refs[formName].validate((valid) => {
if (valid) {
that.submitAll(that.rainType, that.form[this.idname])
diff --git a/src/views/rain/order/check.vue b/src/views/rain/order/check.vue
index 42df61a..d549a9b 100644
--- a/src/views/rain/order/check.vue
+++ b/src/views/rain/order/check.vue
@@ -112,7 +112,9 @@
-
+
+
+
@@ -137,11 +139,15 @@
import {listCommonuser} from"../../../api/common.js"
import {listaccount} from "../../../api/basic/account.js"
import LxHeader from "@/components/LxHeader/index.vue";
- import maintainInfo from '@/views/rain/order/components/maintainInfo'
+ import maintainInfo from '@/views/rain/order/components/maintainInfo'
+ import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
+ import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
export default {
components: {
LxHeader,
- maintainInfo
+ maintainInfo,
+ showRainEquipmentInfo,
+ showRainSiteInfo
},
data() {
return {
@@ -416,8 +422,27 @@ updeatshow(e){
},
info(obj,what) {
var that = this;
- this.showinfo = true
- this.$refs.maintain.info(obj.rain_maintain_id)
+ if(obj.rain_inspection_id){
+ // 日常雨水设施
+ if(obj.rain_inspection_info.type==1){
+ this.$refs.showRainEquipmentInfo.isShow = true
+ this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.rain_inspection_id)
+ this.$refs.showRainEquipmentInfo.infoId = obj.rain_inspection_id
+ this.$refs.showRainEquipmentInfo.formType = 'showform'
+ }
+ // 工地
+ if(obj.rain_inspection_info.type==2){
+ this.$refs.showRainSiteInfo.isShow = true
+ this.$refs.showRainSiteInfo.getSiteInfo(obj.rain_inspection_id)
+ this.$refs.showRainSiteInfo.infoId = obj.rain_inspection_id
+ this.$refs.showRainSiteInfo.formType = 'showform'
+ }
+ }
+ if(obj.rain_maintain_id){
+ this.showinfo = true
+ this.$refs.maintain.info(obj.rain_maintain_id)
+ }
+
},
edit(obj) {
this.form = this.$options.data().form
diff --git a/src/views/rain/order/components/maintainInfo.vue b/src/views/rain/order/components/maintainInfo.vue
index 7b6f968..ffe8832 100644
--- a/src/views/rain/order/components/maintainInfo.vue
+++ b/src/views/rain/order/components/maintainInfo.vue
@@ -1,7 +1,7 @@
-
+
@@ -489,18 +489,19 @@
export default {
name:"maintainInfo",
props:{
- dialogFormDetailVisible:{
- type:Boolean,
- default:() => {
- return false
- }
- }
+ // dialogFormDetailVisible:{
+ // type:Boolean,
+ // default:() => {
+ // return false
+ // }
+ // }
},
data() {
return {
rainType:6,
- maintainids:0,
- showdiago: false,
+ maintainids:0,
+ dialogFormDetailVisible:false,
+ // showdiago: this.dialogFormDetailVisible,
formLabelWidth: "120px",
dialogImageUrl: "",
dialogVisible: false,
@@ -596,7 +597,8 @@
},
changeShow(){
- this.$emit("update", false);
+ this.dialogFormDetailVisible=false
+ // this.$emit("update:dialogFormDetailVisible", false);
// this.$emit('shows',this.dialogFormDetailVisible=false);
},
info(id) {
diff --git a/src/views/rain/order/send.vue b/src/views/rain/order/send.vue
index c101653..45faf61 100644
--- a/src/views/rain/order/send.vue
+++ b/src/views/rain/order/send.vue
@@ -339,9 +339,11 @@
-
-
+
+
+
+
@@ -364,11 +366,15 @@
import {listCommonuser} from"../../../api/common.js"
import {listaccount} from "../../../api/basic/account.js"
import LxHeader from "@/components/LxHeader/index.vue";
- import maintainInfo from '@/views/rain/order/components/maintainInfo'
+ import maintainInfo from '@/views/rain/order/components/maintainInfo'
+ import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
+ import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
export default {
components: {
LxHeader,
- maintainInfo
+ maintainInfo,
+ showRainEquipmentInfo,
+ showRainSiteInfo
},
data() {
return {
@@ -566,10 +572,10 @@
},
},
methods: {
- showsfalse(val){
- console.log(val)
- this.showinfo = false
- },
+ // showsfalse(val){
+ // console.log(val)
+ // this.showinfo = false
+ // },
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -713,13 +719,29 @@
})
},
show(obj,ck){
- if(obj.rain_maintain_id>0){
- this.showinfo = true
+ if(obj.rain_inspection_id){
+ // 日常雨水设施
+ if(obj.rain_inspection_info.type==1){
+ this.$refs.showRainEquipmentInfo.isShow = true
+ this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.rain_inspection_id)
+ this.$refs.showRainEquipmentInfo.infoId = obj.rain_inspection_id
+ this.$refs.showRainEquipmentInfo.formType = 'showform'
+ }
+ // 工地
+ if(obj.rain_inspection_info.type==2){
+ this.$refs.showRainSiteInfo.isShow = true
+ this.$refs.showRainSiteInfo.getSiteInfo(obj.rain_inspection_id)
+ this.$refs.showRainSiteInfo.infoId = obj.rain_inspection_id
+ this.$refs.showRainSiteInfo.formType = 'showform'
+ }
+ }else if(obj.rain_maintain_id>0){
+ this.$refs.maintain.dialogFormDetailVisible = true
+ // this.showinfo = true
this.$refs.maintain.info(obj.rain_maintain_id)
}else{
this.info(obj,ck)
}
-
+
// this.dialogOrderFormVisible = true
},
edit(obj,pd) {