From 0a18ecfd47b469c4e3aed41c91de8ef3eb54f332 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 14 Jul 2022 14:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=93=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
order/order/orderList/orderList.vue | 2 +-
packageA/pages/generalList/generalList.vue | 17 +++++---
.../pages/generalPatrol/generalPatrol.vue | 15 +++++--
pages.json | 2 +-
pages/index/index.vue | 16 ++++---
.../raininspection/raininspection.vue | 15 +++++--
.../raininspectionlist/raininspectionList.vue | 8 ++++
rainmaintain/rainmaintain/rainmaintain.vue | 13 ++++++
.../rainmaintainlist/rainmaintainList.vue | 13 ++++++
role/role/role.vue => road/road/road.vue | 42 +++++++++++++------
10 files changed, 111 insertions(+), 32 deletions(-)
rename role/role/role.vue => road/road/road.vue (79%)
diff --git a/order/order/orderList/orderList.vue b/order/order/orderList/orderList.vue
index a55af5e..57f4792 100644
--- a/order/order/orderList/orderList.vue
+++ b/order/order/orderList/orderList.vue
@@ -135,7 +135,6 @@
},
onLoad(options) {
this.loadDep()
- this.loadPage(1);
},
methods: {
loadDep(){
@@ -148,6 +147,7 @@
},
utilSuccess: function(res) {
that.depList = res
+ that.loadPage(1);
},
utilFail: function(res) {
that.util.alert(res);
diff --git a/packageA/pages/generalList/generalList.vue b/packageA/pages/generalList/generalList.vue
index 8d6df26..50c9bd5 100644
--- a/packageA/pages/generalList/generalList.vue
+++ b/packageA/pages/generalList/generalList.vue
@@ -52,12 +52,16 @@
{{item.feedback_department.name}}
-
+
+
+
+
+ 所属道路：
+
+
+ {{item.road_name}}
+
+
@@ -244,6 +248,7 @@
}
for (var m of dataList) {
m.created_at = m.created_at.split("T")[0]
+ m.road_name = m.road?m.road.name:""
switch(m.status){
case 1:
m.statusName = "已提交"
diff --git a/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue
index c066469..4e6cddf 100644
--- a/packageA/pages/generalPatrol/generalPatrol.vue
+++ b/packageA/pages/generalPatrol/generalPatrol.vue
@@ -1,5 +1,8 @@
-
+
+
+ 所属道路：{{roadName}}
+
@@ -42,7 +45,8 @@
return {
otherData: {
token: ""
- },
+ },
+ roadName:"",
unitshow: false,
typeshow: false,
contentshow: false,
@@ -95,6 +99,10 @@
if(options.id){
this.infoId = options.id;
this.showInfo(this.infoId);
+ }
+ if(options.roadid){
+ this.form.road_id = options.roadid
+ this.roadName = options.roadname
}
this.action = this.util.HOST + "/api/mobile/upload-file";
this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
@@ -198,7 +206,8 @@
that.form = result;
that.form.typeName = result.ask_type_detail.value;
that.form.contentName = result.ask_content_detail.value;
- that.form.unitName = result.feedback_department.name
+ that.form.unitName = result.feedback_department.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/pages.json b/pages.json
index 7504e28..74b5f82 100644
--- a/pages.json
+++ b/pages.json
@@ -38,7 +38,7 @@
}
,{
- "path" : "role/role/role",
+ "path" : "road/road/road",
"style" :
{
"navigationBarTitleText": "选择道路",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index eb1299c..41dcbf9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -90,22 +90,26 @@
});
},
toview(type) {
- let url = "/packageA/pages/generalPatrol/generalPatrol";
+ // let url = "/packageA/pages/generalPatrol/generalPatrol";
+ let url = "/road/road/road?type=general"
if (type == 2) {
url = "/pages/mine/mine"
}
if (type == 3) {
+ // url = "/road/road/road?type=daily"
url = "/packageB/pages/dailyInspection/dailyInspection"
}
if (type == 4) {
- url = "/rainmaintain/rainmaintain/rainmaintain"
+ url = "/road/road/road?type=rainmaintain"
+ // url = "/rainmaintain/rainmaintain/rainmaintain"
}
if (type == 5) {
- url = "/raininspection/raininspection/raininspection"
+ url = "/road/road/road?type=raininspection"
+ // url = "/raininspection/raininspection/raininspection"
}
- if (type == 6) {
- url = "/order/order/order/order"
- }
+ // if (type == 6) {
+ // url = "/order/order/order/order"
+ // }
uni.navigateTo({
url: url
})
diff --git a/raininspection/raininspection/raininspection.vue b/raininspection/raininspection/raininspection.vue
index 314364b..d7620e9 100644
--- a/raininspection/raininspection/raininspection.vue
+++ b/raininspection/raininspection/raininspection.vue
@@ -1,5 +1,8 @@
+
+ 所属道路：{{roadName}}
+
@@ -138,6 +141,7 @@
otherData: {
token: ""
},
+ roadName:"",
instype:1,
typeShow:false,
askShow:false,
@@ -223,6 +227,7 @@
filesList:[],
dealFilesList:[],
form:{
+ road_id:'',
content:"",
ask_content_id:"",
is_unusual:0,
@@ -277,9 +282,12 @@
setTimeout(function(){
that.showInfo(that.infoId);
},1000)
-
}
-
+ if(options.roadid){
+ this.form.road_id = options.roadid
+ this.roadName = options.roadname
+ }
+
this.action = this.util.HOST + "/api/mobile/upload-file";
this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
},
@@ -537,6 +545,7 @@
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.roadName = result.rain_equipment_info.road?result.rain_equipment_info.road.name:""
let _files = [];
for (var mod of result.rain_equipment_info.rain_equipment_files) {
let m = Object.assign({}, mod);
@@ -574,7 +583,7 @@
that.form.latitude = result.building_site_info.building_site.latitude;
that.form.longitude = result.building_site_info.building_site.longitude;
that.form.address = result.building_site_info.building_site.address;
- console.log("a",that.rainArr.buildTypes);
+ that.roadName = result.building_site_info.road?result.building_site_info.road.name:""
for(var m of that.rainArr.buildTypes){
if(result.building_site_info.building_site.type==m.id){
that.buildtypeName = m.value;
diff --git a/raininspection/raininspectionlist/raininspectionList.vue b/raininspection/raininspectionlist/raininspectionList.vue
index ae8ae77..e3bb4e3 100644
--- a/raininspection/raininspectionlist/raininspectionList.vue
+++ b/raininspection/raininspectionlist/raininspectionList.vue
@@ -44,6 +44,12 @@
{{item.area_info.name}}
+
+
+ 所属道路：
+
+
+ {{item.road_name}}
-
- 附近街道:
+ 附近道路:
@@ -56,7 +56,9 @@
longitude:"",
latitude:"",
showClear:false,
- towhere:"",
+ totype:"",
+ road_id:"",
+ road_name:""
}
},
@@ -75,22 +77,42 @@
},
onLoad(options) {
let that = this;
+ that.totype=options.type
uni.getLocation({
type: "gcj02",
geocode:true,
success(res) {
- console.log(res)
that.latitude = res.latitude;
that.longitude = res.longitude;
that.loadPage(1);
}
-
})
},
methods: {
+ towhichtype(){
+ let totype = this.totype
+ let url = "/packageA/pages/generalPatrol/generalPatrol";
+ if (totype == 'general') {
+ url ="/packageA/pages/generalPatrol/generalPatrol?roadid="+this.road_id+"&roadname="+this.road_name
+ }
+ if (totype == 'daily') {
+ url = "/packageB/pages/dailyInspection/dailyInspection?roadid="+this.road_id+"&roadname="+this.road_name
+ }
+ if (totype == 'rainmaintain') {
+ url = "/rainmaintain/rainmaintain/rainmaintain?roadid="+this.road_id+"&roadname="+this.road_name
+ }
+ if (totype == 'raininspection') {
+ url = "/raininspection/raininspection/raininspection?roadid="+this.road_id+"&roadname="+this.road_name
+ }
+ uni.navigateTo({
+ url: url
+ })
+ },
radioChange(val){
- console.log("val",val)
+ let arr = val.split(",")
+ this.road_id = arr[0]
+ this.road_name = arr[1]
},
tosearch() {
this.latitude=""
@@ -118,7 +140,6 @@
name: that.keyword,
},
utilSuccess: function(r) {
- console.log("r",that.longitude)
if(that.longitude!=""){
// var res = r;
that.showClear = true
@@ -152,13 +173,10 @@
} else {
dataList.push(...res);
}
- console.log(dataList)
that.currentPage = page;
that.dataList = dataList;
- }
-
- console.log("res",res)
+ }