From 0369dbdce545a8708b7375863169366ee26aa2a2 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 30 Aug 2022 14:35:31 +0800 Subject: [PATCH 1/3] up --- rainmaintain/rainmaintainlist/rainmaintainList.vue | 2 +- utils/util.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rainmaintain/rainmaintainlist/rainmaintainList.vue b/rainmaintain/rainmaintainlist/rainmaintainList.vue index 703bd3f..a5fd919 100644 --- a/rainmaintain/rainmaintainlist/rainmaintainList.vue +++ b/rainmaintain/rainmaintainlist/rainmaintainList.vue @@ -294,7 +294,7 @@ break; } - switch (m.type) { + switch (m.old_type) { case 1: m.typeName = "雨水管道疏挖" m.road_name = m.circulation_info.road ? m.circulation_info.road.name : diff --git a/utils/util.js b/utils/util.js index 92032b4..438a10e 100755 --- a/utils/util.js +++ b/utils/util.js @@ -1,8 +1,8 @@ import md5 from "./md5.min"; const HOSTARR = { - 'development': 'http://192.168.60.100:9001', - // 'development': 'http://patrol.115.langye.net', - 'production': 'http://192.168.60.100:9001' + // 'development': 'http://192.168.60.100:9001', + 'development': 'http://patrol.115.langye.net', + // 'production': 'http://192.168.60.100:9001' }; // 审核状态 const HOST = HOSTARR[process.env From 0c92eeb2a602f16652558aee069b13628028e5aa Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 30 Aug 2022 14:43:12 +0800 Subject: [PATCH 2/3] upup --- rainmaintain/rainmaintain/rainmaintain.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rainmaintain/rainmaintain/rainmaintain.vue b/rainmaintain/rainmaintain/rainmaintain.vue index e96ad33..2a7e67d 100644 --- a/rainmaintain/rainmaintain/rainmaintain.vue +++ b/rainmaintain/rainmaintain/rainmaintain.vue @@ -430,18 +430,18 @@ }, utilSuccess: function(result) { - switch (result.type) { + switch (result.old_type) { case 1: case 2: case 6: case 7: - if (result.type == 1) { + if (result.old_type == 1) { that.typeName = "雨水管道疏挖" - } else if (result.type == 2) { + } else if (result.old_type == 2) { that.typeName = "雨水管道疏通" - }else if (result.type == 6) { + }else if (result.old_type == 6) { that.typeName = "专项处理" - }else if (result.type == 7) { + }else if (result.old_type == 7) { that.typeName = "维修" } @@ -450,7 +450,7 @@ that.roadName = result.circulation_info.road ? result.circulation_info.road .name : "" that.askName = result.circulation_info.title_detail ? result.circulation_info - .title_detail.value : "" + .title_detail : "" let _files = []; for (var mod of result.circulation_info.circulation_files) { @@ -483,7 +483,7 @@ that.roadName = result.out_water_info.road ? result.out_water_info.road.name : "" that.askName = result.out_water_info.title_detail ? result.out_water_info - .title_detail.value : "" + .title_detail : "" let water_files = []; for (var mod of result.out_water_info.out_water_files) { let m = Object.assign({}, mod); From 0d1ac6abc8ecb1986052bb15eca3f25dc32257e1 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 30 Aug 2022 15:27:18 +0800 Subject: [PATCH 3/3] upup --- raininspection/raininspection/raininspection.vue | 11 +++++++++-- rainmaintain/rainmaintain/rainmaintain.vue | 8 ++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/raininspection/raininspection/raininspection.vue b/raininspection/raininspection/raininspection.vue index 8a70a70..8b1a150 100644 --- a/raininspection/raininspection/raininspection.vue +++ b/raininspection/raininspection/raininspection.vue @@ -482,7 +482,12 @@ that.form.start_latitude="" that.form.end_address="" that.form.end_longitude="" - that.form.end_latitude="" + that.form.end_latitude="" + that.form.ask_content_id="" + that.askName="" + } + if (val[0].value == 1) { + that.loadAskContent() } console.log("res", that.form) }, @@ -656,7 +661,9 @@ number: "equiementList" }, utilSuccess: function(result) { - that.rainArr.askContentList = result.detail + that.rainArr.askContentList = result.detail + that.form.ask_content_id = that.rainArr.askContentList[0].id+"" + that.askName = that.rainArr.askContentList[0].value }, utilFail: function(res) { that.util.alert(res); diff --git a/rainmaintain/rainmaintain/rainmaintain.vue b/rainmaintain/rainmaintain/rainmaintain.vue index 2a7e67d..248cdf1 100644 --- a/rainmaintain/rainmaintain/rainmaintain.vue +++ b/rainmaintain/rainmaintain/rainmaintain.vue @@ -327,7 +327,9 @@ that.formshow = false that.form.address = "" that.form.latitude = "" - that.form.longitude = "" + that.form.longitude = "" + that.form.title_id="" + that.askName="" } if (val[0].value == 3 || val[0].value == 4) { that.lawshow = false @@ -354,7 +356,9 @@ number: "maintainContent" + "_" + that.form.type }, utilSuccess: function(result) { - that.rainArr.askContentList = result.detail + that.rainArr.askContentList = result.detail + that.form.title_id = that.rainArr.askContentList[0].id+"" + that.askName = that.rainArr.askContentList[0].value }, utilFail: function(res) { that.util.alert(res);