From 44988a417e25ad4e926acb9b07a3bbd52157fb1f Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 5 Aug 2022 09:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B7=A1=E6=9F=A5=20?=
=?UTF-8?q?=E5=85=BB=E6=8A=A4=20=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
order/order/orderInfo/orderInfo.vue | 16 +++-
packageA/pages/generalPatrol/viewPatrol.vue | 14 ++-
packageB/pages/dailyInfo/dailyInfo.vue | 16 +++-
.../raininspection/raininspection.vue | 26 ++++--
.../raininspectioninfo/raininspectionInfo.vue | 50 ++++++++--
rainmaintain/rainmaintain/rainmaintain.vue | 44 ++++++++-
.../rainmaintaininfo/rainmaintainInfo.vue | 93 +++++++++++++++++--
.../rainmaintainlist/rainmaintainList.vue | 9 +-
8 files changed, 227 insertions(+), 41 deletions(-)
diff --git a/order/order/orderInfo/orderInfo.vue b/order/order/orderInfo/orderInfo.vue
index e9b3b69..046ef0a 100644
--- a/order/order/orderInfo/orderInfo.vue
+++ b/order/order/orderInfo/orderInfo.vue
@@ -46,7 +46,7 @@
现场照片：
-
+
@@ -86,7 +86,7 @@
处理后照片：
-
+
@@ -128,7 +128,17 @@
}
this.loadDep()
},
- methods: {
+ methods: {
+ imgListPreview(item){
+ var urlList = []
+ urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
+ uni.previewImage({
+ indicator:"number",
+ loop:true,
+ urls: urlList
+ })
+
+ },
loadDep(){
var that = this
that.util.request({
diff --git a/packageA/pages/generalPatrol/viewPatrol.vue b/packageA/pages/generalPatrol/viewPatrol.vue
index aded628..0175347 100644
--- a/packageA/pages/generalPatrol/viewPatrol.vue
+++ b/packageA/pages/generalPatrol/viewPatrol.vue
@@ -54,7 +54,7 @@
现场图片：
-
+
@@ -88,7 +88,17 @@
this.loadInfo(options.id)
}
},
- methods: {
+ methods: {
+ imgListPreview(item){
+ var urlList = []
+ urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
+ uni.previewImage({
+ indicator:"number",
+ loop:true,
+ urls: urlList
+ })
+
+ },
loadInfo: function(id) {
var that = this;
this.util.request({
diff --git a/packageB/pages/dailyInfo/dailyInfo.vue b/packageB/pages/dailyInfo/dailyInfo.vue
index 7243110..39e4066 100644
--- a/packageB/pages/dailyInfo/dailyInfo.vue
+++ b/packageB/pages/dailyInfo/dailyInfo.vue
@@ -40,7 +40,7 @@
现场图片：
-
+
@@ -57,7 +57,7 @@
处理后照片：
-
+
@@ -98,7 +98,17 @@
this.loadInfo(options.id)
}
},
- methods: {
+ methods: {
+ imgListPreview(item){
+ var urlList = []
+ urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
+ uni.previewImage({
+ indicator:"number",
+ loop:true,
+ urls: urlList
+ })
+
+ },
loadInfo: function(id) {
var that = this;
this.util.request({
diff --git a/raininspection/raininspection/raininspection.vue b/raininspection/raininspection/raininspection.vue
index d040369..b5da7e4 100644
--- a/raininspection/raininspection/raininspection.vue
+++ b/raininspection/raininspection/raininspection.vue
@@ -24,14 +24,11 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -90,7 +87,7 @@
-
+
{{item.name}}
@@ -232,7 +229,9 @@
form: {
road_id: '',
content: "",
- ask_content_id: "",
+ ask_content_id: "",
+ scope:"",
+ point_name:"",
is_unusual: 0,
is_scene: 0,
result: "",
@@ -342,6 +341,13 @@
// }
+ },
+ lawRadioChange(val){
+ console.log(val)
+ if(val==0){
+ this.form.break_id=""
+ this.lawName = ""
+ }
},
confirmBuildTypeName(val) {
console.log(val)
diff --git a/raininspection/raininspectioninfo/raininspectionInfo.vue b/raininspection/raininspectioninfo/raininspectionInfo.vue
index 4cf3639..23921bd 100644
--- a/raininspection/raininspectioninfo/raininspectionInfo.vue
+++ b/raininspection/raininspectioninfo/raininspectionInfo.vue
@@ -24,6 +24,30 @@
{{typeName}}
+
+
+
+ 巡查内容：
+
+
+ {{askName}}
+
+
+
+
+ 覆盖范围：
+
+
+ {{form.scope}}米
+
+
+
+
+ 点位名称：
+
+
+ {{form.point_name}}
+
@@ -106,7 +130,7 @@
现场图片：
-
+
@@ -149,7 +173,7 @@
处理后图片：
-
+
@@ -172,7 +196,8 @@
data() {
return {
formshow:true,
- lawshow:true,
+ lawshow:true,
+ scopeShow:false,
lists:{},
form:{},
typeName:"",
@@ -196,7 +221,17 @@
this.loadInfo(options.id)
}
},
- methods: {
+ methods: {
+ imgListPreview(item){
+ var urlList = []
+ urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
+ uni.previewImage({
+ indicator:"number",
+ loop:true,
+ urls: urlList
+ })
+
+ },
loadInfo: function(id) {
var that = this;
this.util.request({
@@ -212,11 +247,12 @@
switch(result.type){
case 1:
that.typeName = "日常雨水设施"
- that.instype = 1
+ that.instype = 1
+ that.scopeShow = true
that.form = result.rain_equipment_info;
that.form.rain_equipment_id = result.rain_equipment_id;
that.askName = result.rain_equipment_info.ask_content_detail.value
- that.areaName = result.area_info.name
+ that.areaName = result.area_info?result.area_info.name:""
if(result.rain_equipment_info.is_unusual==1){
that.form.unsualName == "丢失"
}else if(result.rain_equipment_info.is_unusual==2){
@@ -250,7 +286,7 @@
that.formshow=false
that.typeName = "在建工地"
that.formshow = false
- that.areaName = result.area_info.name
+ that.areaName = result.area_info?result.area_info.name:""
that.form = result.building_site_info;
that.form.buildName = result.building_site_info.building_site.name
diff --git a/rainmaintain/rainmaintain/rainmaintain.vue b/rainmaintain/rainmaintain/rainmaintain.vue
index c44abb4..85ee41e 100644
--- a/rainmaintain/rainmaintain/rainmaintain.vue
+++ b/rainmaintain/rainmaintain/rainmaintain.vue
@@ -35,7 +35,7 @@
-
+
@@ -273,7 +273,6 @@
},
methods: {
confirmType(val) {
- console.log(val)
var that = this
this.$refs.uForm.resetFields();
that.typeName = val[0].label
@@ -282,7 +281,9 @@
that.lawshow = true
that.aboutShow = false
that.numShow = false
- that.filesList = [];
+ that.filesList = [];
+ that.askName = ""
+ that.form.title_id=""
this.$refs.uUpload.clear();
that.dealFilesList = [];
that.form.scope = ""
@@ -408,7 +409,9 @@
that.form = result.circulation_info;
that.form.circulation_id = result.circulation_id;
- that.roadName = result.circulation_info.road.name
+ that.roadName = result.circulation_info.road?result.circulation_info.road.name:""
+ that.askName = result.circulation_info.title_detail?result.circulation_info.title_detail.value:""
+
let _files = [];
for (var mod of result.circulation_info.circulation_files) {
let m = Object.assign({}, mod);
@@ -430,7 +433,38 @@
that.dealFilesList = _filesafter;
that.form.type = result.type
console.log(that.form)
- break;
+ break;
+ case 5:
+ that.typeName = "出水口排查"
+ that.numShow = true
+ that.aboutShow = true
+ that.form = result.out_water_info;
+ that.form.out_water_id = result.out_water_id
+ 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:""
+ let water_files = [];
+ for (var mod of result.out_water_info.out_water_files) {
+ let m = Object.assign({}, mod);
+ m.url = mod.files.url;
+ m.id = mod.files.id;
+ m.photoType = "before";
+ water_files.push(m);
+ }
+ that.filesList = water_files;
+
+ let water_filesafter = [];
+ for (var mod of result.out_water_info.out_water_deal_files) {
+ let m = Object.assign({}, mod);
+ m.url = mod.files.url;
+ m.id = mod.files.id;
+ m.photoType = "after";
+ water_filesafter.push(m);
+ }
+ that.dealFilesList = water_filesafter;
+ that.form.type = result.type
+ console.log(that.form)
+
+ break
case 3:
that.typeName = "汛期助排"
that.lawshow = false
diff --git a/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue b/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue
index f781f05..6fc4233 100644
--- a/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue
+++ b/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue
@@ -24,6 +24,38 @@
{{form.typeName}}
+
+
+
+ 养护内容：
+
+
+ {{titleName}}
+
+
+
+
+ 排水口编号：
+
+
+ {{form.number}}
+
+
+
+
+ 覆盖范围：
+
+
+ {{form.scope}}米
+
+
+
+
+ 点位名称：
+
+
+ {{form.point_name}}
+
@@ -46,7 +78,7 @@
现场图片：
-
+
@@ -87,7 +119,7 @@
处理后图片：
-
+
@@ -114,7 +146,9 @@
data() {
return {
formshow:true,
- lawshow:true,
+ lawshow:true,
+ titleName:"",
+ watershow:false,
lists:{},
form:{},
filesList:[],
@@ -130,7 +164,17 @@
this.loadInfo(options.id)
}
},
- methods: {
+ methods: {
+ imgListPreview(item){
+ var urlList = []
+ urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
+ uni.previewImage({
+ indicator:"number",
+ loop:true,
+ urls: urlList
+ })
+
+ },
loadInfo: function(id) {
var that = this;
this.util.request({
@@ -170,8 +214,9 @@
that.form.type = result.type
result.circulation_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
result.circulation_info.is_law==0 ? that.form.lawName="否":that.form.lawName="是"
- that.form.areaName = result.area_info.name
- that.form.created_at = result.created_at
+ that.form.areaName = result.area_info?result.area_info.name:""
+ that.form.created_at = result.created_at
+ that.titleName = result.circulation_info.title_detail?result.circulation_info.title_detail.value:''
break;
case 3:
that.lawshow = false
@@ -198,7 +243,7 @@
that.form.type = result.type
that.form.typeName = "汛期助排"
result.help_discharge_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
- that.form.areaName = result.area_info.name
+ that.form.areaName = result.area_info?result.area_info.name:""
that.form.created_at = result.created_at
break;
case 4:
@@ -215,9 +260,39 @@
that.filesList =mire_files;
that.form.type = result.type
that.form.typeName = "污泥外运"
- that.form.areaName = result.area_info.name
+ that.form.areaName = result.area_info?result.area_info.name:""
that.form.created_at = result.created_at
- break;
+ break;
+ case 5:
+ that.watershow = true
+ that.form = result.out_water_info;
+ let water_files = [];
+ for (var mod of result.out_water_info.out_water_files) {
+ let m = Object.assign({}, mod);
+ m.url = mod.files.url;
+ m.id = mod.files.id;
+ m.photoType = "before";
+ water_files.push(m);
+ }
+ that.filesList = water_files;
+
+ let water_filesafter = [];
+ for (var mod of result.out_water_info.out_water_deal_files) {
+ let m = Object.assign({}, mod);
+ m.url = mod.files.url;
+ m.id = mod.files.id;
+ m.photoType = "after";
+ water_filesafter.push(m);
+ }
+ that.dealFilesList = water_filesafter;
+ that.form.type = result.type
+ that.form.typeName = "出水口排查"
+ result.out_water_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
+ result.out_water_info.is_law==0 ? that.form.lawName="否":that.form.lawName="是"
+ that.form.areaName = result.area_info?result.area_info.name:""
+ that.form.created_at = result.created_at
+ that.titleName = result.out_water_info.title_detail?result.out_water_info.title_detail.value:''
+ break;
}
},
utilFail: function(res) {
diff --git a/rainmaintain/rainmaintainlist/rainmaintainList.vue b/rainmaintain/rainmaintainlist/rainmaintainList.vue
index e596d57..f0212c4 100644
--- a/rainmaintain/rainmaintainlist/rainmaintainList.vue
+++ b/rainmaintain/rainmaintainlist/rainmaintainList.vue
@@ -42,7 +42,7 @@
所属片区：
- {{item.area_info.name}}
+ {{item.area_info?item.area_info.name:""}}
所属道路：
@@ -306,7 +306,12 @@
m.typeName = "污泥外运"
m.road_name = m.mire_info.road?m.mire_info.road.name:""
- break
+ break
+ case 5:
+ m.typeName = "出水口排查"
+ m.road_name = m.out_water_info.road?m.out_water_info.road.name:""
+
+ break
default: