From 6ef2804407e39a8a4592da0ea1eb4a5179351a3f Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 30 Aug 2022 09:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=B7=A1=E6=9F=A5=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4road=E2=80=94id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/pages/generalList/generalList.vue     | 16 ++++++++--------
 packageA/pages/generalPatrol/generalPatrol.vue | 16 ++++++++--------
 packageA/pages/generalPatrol/viewPatrol.vue    | 18 +++++++++---------
 packageB/pages/dailyInfo/dailyInfo.vue         | 16 ++++++++--------
 packageB/pages/dailyList/dailyList.vue         | 12 ++++++------
 pages/index/index.vue                          |  4 ++--
 road/road/road.vue                             |  8 ++++----
 7 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/packageA/pages/generalList/generalList.vue b/packageA/pages/generalList/generalList.vue
index 7f7e84a..724a260 100644
--- a/packageA/pages/generalList/generalList.vue
+++ b/packageA/pages/generalList/generalList.vue
@@ -27,29 +27,29 @@
 					thumb-width="36">
 					<view class="" slot="body" @click="todetail(item.id)">
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">问题类别：</view>
 							</u-col>
-							<u-col span="3">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{item.ask_type_detail.value}}</view>
 							</u-col>
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">问题内容：</view>
 							</u-col>
-							<u-col span="3">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{item.ask_content_detail.value}}</view>
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">反馈科室：</view>
 							</u-col>
-							<u-col span="3">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{item.feedback_department.name}}</view>
 							</u-col>
 
 						</u-row>
-						<u-row gutter="16">
+					<!-- 	<u-row gutter="16">
 							<u-col span="3">
 								<view class="demo-layout bg-purple">所属道路：</view>
 							</u-col>
@@ -57,7 +57,7 @@
 								<view class="demo-layout bg-purple-light">{{item.road_name}}</view>
 							</u-col>
 
-						</u-row>
+						</u-row> -->
 						<u-row gutter="16">
 							<u-col span="3">
 								<view class="demo-layout bg-purple">描述：</view>
diff --git a/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue
index 0e97eab..b8bebee 100644
--- a/packageA/pages/generalPatrol/generalPatrol.vue
+++ b/packageA/pages/generalPatrol/generalPatrol.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
-		<view>
+		<!-- <view>
 			所属道路：{{roadName}}
-		</view>
+		</view> -->
 		<u-form :model="form" ref="uForm">
 			<u-form-item label="问题类型" label-position="top" prop="typeName" required>
 				<u-input v-model="form.typeName" type="select" :border="true" @click="typeshow = true" />
@@ -46,7 +46,7 @@
 				otherData: {
 					token: ""
 				},
-				roadName:"",
+				// roadName:"",
 				unitshow: false,
 				typeshow: false,
 				contentshow: false,
@@ -100,10 +100,10 @@
 				this.infoId = options.id;
 				this.showInfo(this.infoId);
 			}
-			if(options.roadid){
-				this.form.road_id = options.roadid
-				this.roadName = options.roadname
-			}
+			// 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;
 			this.loadUnit();
@@ -223,7 +223,7 @@
 						that.form.typeName = result.ask_type_detail.value;
 						that.form.contentName = result.ask_content_detail.value;
 						that.form.unitName = result.feedback_department.name
-						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/packageA/pages/generalPatrol/viewPatrol.vue b/packageA/pages/generalPatrol/viewPatrol.vue
index 0175347..ff0e2b7 100644
--- a/packageA/pages/generalPatrol/viewPatrol.vue
+++ b/packageA/pages/generalPatrol/viewPatrol.vue
@@ -10,34 +10,34 @@
 				<u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true">
 					<view class="" slot="body" @click="todetail(lists.id)">
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">问题类型：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{lists.ask_type_detail.value}}</view>
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">问题内容：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{lists.ask_content_detail.value}}</view>
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">反馈科室：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{lists.feedback_department.name}}</view>
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">位置：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="12">
 								<view class="demo-layout bg-purple-light">{{lists.address}}</view>
 							</u-col>
 						</u-row>
@@ -50,7 +50,7 @@
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">现场图片：</view>
 							</u-col>
 							<u-col span="12" v-for="(item,index) in lists.common_inspection_files">
diff --git a/packageB/pages/dailyInfo/dailyInfo.vue b/packageB/pages/dailyInfo/dailyInfo.vue
index 39e4066..aa41b3f 100644
--- a/packageB/pages/dailyInfo/dailyInfo.vue
+++ b/packageB/pages/dailyInfo/dailyInfo.vue
@@ -10,25 +10,25 @@
 				<u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true">
 					<view class="" slot="body" @click="todetail(lists.id)">
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">巡查项目：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{lists.name}}</view>
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">项目状态：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="8">
 								<u-tag v-if="lists.status==1" text="无异常" type="primary" />
 								<u-tag v-if="lists.status==2" text="已现场处理" type="warning" />
 								<u-tag v-if="lists.status==3" text="不可现场处理" type="error" />
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">巡查记录：</view>
 							</u-col>
 							<u-col span="12">
@@ -36,7 +36,7 @@
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">现场图片：</view>
 							</u-col>
 							<u-col span="12" v-for="(item,index) in lists.daily_inspection_files">
@@ -45,7 +45,7 @@
 						</u-row>
 						
 						<u-row gutter="16" v-if="lists.status==2">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">处理记录：</view>
 							</u-col>
 							<u-col span="12">
@@ -62,7 +62,7 @@
 						</u-row>
 						
 						<u-row gutter="16" v-if="lists.status==3">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">定位地址：</view>
 							</u-col>
 							<u-col span="9">
diff --git a/packageB/pages/dailyList/dailyList.vue b/packageB/pages/dailyList/dailyList.vue
index d11d681..9ee2605 100644
--- a/packageB/pages/dailyList/dailyList.vue
+++ b/packageB/pages/dailyList/dailyList.vue
@@ -26,28 +26,28 @@
 					 :thumb="thumb" thumb-width="36">
 					<view class="" slot="body" @click="todetail(item.id)">
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">巡查项目：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="8">
 								<view class="demo-layout bg-purple-light">{{item.name}}</view>
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">处理方式：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="8">
 								<u-tag v-if="item.status==1" text="无异常" type="primary" />
 								<u-tag v-if="item.status==2" text="已现场处理" type="warning" />
 								<u-tag v-if="item.status==3" text="不可现场处理" type="error" />
 							</u-col>
 						</u-row>
 						<u-row gutter="16" v-if="item.status==3">
-							<u-col span="3">
+							<u-col span="4">
 								<view class="demo-layout bg-purple">定位地址：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="12">
 								{{item.address}}
 							</u-col>
 						</u-row>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 78f58ad..5ade41f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -124,8 +124,8 @@
 				});
 			},
 			toview(type) {
-				// let url = "/packageA/pages/generalPatrol/generalPatrol";
-				let url = "/road/road/road?type=general"
+				let url = "/packageA/pages/generalPatrol/generalPatrol";
+				// let url = "/road/road/road?type=general"
 				if (type == 2) {
 					url = "/pages/mine/mine"
 				}
diff --git a/road/road/road.vue b/road/road/road.vue
index ab547d5..7183bde 100644
--- a/road/road/road.vue
+++ b/road/road/road.vue
@@ -115,10 +115,10 @@
 				
 				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+"&orderId="+this.orderId
-				}
+				// if (totype == 'general') {
+				// 	url = "/packageA/pages/generalPatrol/generalPatrol?roadid=" + this.road_id + "&roadname=" + this
+				// 		.road_name+"&orderId="+this.orderId
+				// }
 				if (totype == 'daily') {
 					url = "/packageB/pages/dailyInspection/dailyInspection?roadid=" + this.road_id + "&roadname=" + this
 						.road_name+"&orderId="+this.orderId