From 8a39e11c736faee3ea6a32c7c001dc7196d75a69 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Wed, 24 Jul 2024 19:18:30 +0800
Subject: [PATCH] 1

---
 pages/investigation/task.vue | 191 ++++++++++++++++++++---------------
 pages/map/index.vue          |   2 +-
 2 files changed, 113 insertions(+), 80 deletions(-)

diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 0fefd5b..6c7ed57 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -34,54 +34,68 @@
 			<view class="formBox" v-if="active === 1">
 				<uni-forms :modelValue="formData" border>
 					<uni-forms-item label="道路类型">
-						<input v-if="isEdit" type="text" class="BorderNone Height100" v-model="formData.roadType"
-							placeholder="请输入道路类型" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{
-							formData.roadType
-							}}</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
+								v-model="formData.roadType" placeholder="请输入道路类型" />
+							<view class="Height100"  v-else>{{ formData.roadType }}</view>
+							<view class="Height100"></view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="道路宽度">
-						<input v-if="isEdit" type="number" class="BorderNone Height100" v-model="formData.roadWidth"
-							placeholder="请输入道路宽度" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.roadWidth }}米</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.roadWidth" placeholder="请输入道路宽度" />
+							<view class="Height100"  v-else>{{ formData.roadWidth }}</view>
+							<view class="Height100">米</view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="车辆数">
-						<input v-if="isEdit" type="number" class="BorderNone Height100" v-model="formData.laneCount"
-							placeholder="请输入车辆数" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.laneCount }}辆</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.laneCount" placeholder="请输入车辆数" />
+							<view class="Height100"  v-else>{{ formData.laneCount }}</view>
+							<view class="Height100">辆</view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="路面结构">
-						<input v-if="isEdit" type="text" class="BorderNone Height100" v-model="formData.roadStructure"
-							placeholder="请输入路面结构" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{
-							formData.roadStructure
-							}}</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
+								v-model="formData.roadStructure" placeholder="请输入路面结构" />
+							<view class="Height100"  v-else>{{ formData.roadStructure }}</view>
+							<view class="Height100"></view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="路侧防护">
-						<input v-if="isEdit" type="text" class="BorderNone Height100" v-model="formData.sideProtec"
-							placeholder="请输入路侧防护" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{
-							formData.sideProtec
-							}}</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
+								v-model="formData.sideProtec" placeholder="请输入路侧防护" />
+							<view class="Height100"  v-else>{{ formData.sideProtec }}</view>
+							<view class="Height100"></view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="中央隔离">
-						<input v-if="isEdit" type="text" class="BorderNone Height100" v-model="formData.centerSeparate"
-							placeholder="请输入中央隔离" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{
-							formData.centerSeparate
-							}}</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
+								v-model="formData.centerSeparate" placeholder="请输入中央隔离" />
+							<view class="Height100"  v-else>{{ formData.centerSeparate }}</view>
+							<view class="Height100"></view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="设计时速">
-						<input v-if="isEdit" type="number" class="BorderNone Height100" v-model="formData.designSpeed"
-							placeholder="请输入设计时速" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.designSpeed
-							}}Km/h</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.designSpeed" placeholder="请输入设计时速" />
+							<view class="Height100"  v-else>{{ formData.designSpeed }}</view>
+							<view class="Height100">Km/h</view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="限速">
-						<input v-if="isEdit" type="number" class="BorderNone Height100" v-model="formData.limitSpeed"
-							placeholder="请输入限速" />
-						<text class="Height100 Flex Flex_C_S-Center Flex_end" v-else>{{ formData.limitSpeed
-							}}Km/h</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.limitSpeed" placeholder="请输入限速" />
+							<view class="Height100"  v-else>{{ formData.limitSpeed }}</view>
+							<view class="Height100">Km/h</view>
+						</view>
 					</uni-forms-item>
 				</uni-forms>
 				<view class="photo">
@@ -94,39 +108,53 @@
 			<view class="formBox form-step-2" v-if="active === 2">
 				<uni-forms :modelValue="formData" border label-width="120">
 					<uni-forms-item label="最大流量">
-						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
-							v-model="formData.maxTraffic" placeholder="请输入最大流量" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.maxTraffic }}辆</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.maxTraffic" placeholder="请输入最大流量" />
+							<view class="Height100"  v-else>{{ formData.maxTraffic }}</view>
+							<view class="Height100">辆</view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="高峰流量">
-						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
-							v-model="formData.peakTraffic" placeholder="请输入高峰流量" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.peakTraffic }}辆</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.peakTraffic" placeholder="请输入高峰流量" />
+							<view class="Height100"  v-else>{{ formData.peakTraffic }}</view>
+							<view class="Height100">辆</view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="高峰时段">
-						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
-							v-model="formData.peakHours" placeholder="请输入高峰时段" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{
-							formData.peakHours
-							}}</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.peakHours" placeholder="请输入高峰时段" />
+							<view class="Height100"  v-else>{{ formData.peakHours }}</view>
+							<view class="Height100"></view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="平峰流量">
-						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
-							v-model="formData.normalTraffic" placeholder="请输入平峰流量" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.normalTraffic
-							}}辆</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.normalTraffic" placeholder="请输入高峰时段" />
+							<view class="Height100"  v-else>{{ formData.normalTraffic }}</view>
+							<view class="Height100">辆</view>
+						</view>
+							
 					</uni-forms-item>
 					<uni-forms-item label="大车占比">
-						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
-							v-model="formData.largeVehicleRate" placeholder="请输入大车占比" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.largeVehicleRate
-							}}%</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.largeVehicleRate" placeholder="请输入大车占比" />
+							<view class="Height100"  v-else>{{ formData.largeVehicleRate }}</view>
+							<view class="Height100">%</view>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item label="非机动车流量">
-						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
-							v-model="formData.nonvehicleTraffic" placeholder="请输入非机动车流量" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.nonvehicleTraffic
-							}}辆</text>
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.nonvehicleTraffic" placeholder="请输入非机动车流量" />
+							<view class="Height100"  v-else>{{ formData.nonvehicleTraffic }}</view>
+							<view class="Height100">辆</view>
+						</view>
 					</uni-forms-item>
 				</uni-forms>
 			</view>
@@ -1395,26 +1423,31 @@
 	}
 	
 ::v-deep ::-webkit-scrollbar {
-        // 滚动条整体样式
-        display: block;
-        width: 16rpx !important;
-        height: 16rpx !important;
-        -webkit-appearance: auto !important;
-        background: transparent;
-        overflow: auto !important;
-    }
-     
-    ::v-deep ::-webkit-scrollbar-thumb {
-        // 滚动条里面小方块
-        border-radius: 16rpx !important;
-        box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
-        background-color: #f7f7f7 !important;
-    }
-     
-    ::v-deep ::-webkit-scrollbar-track {
-        // 滚动条
-        border-radius: 16rpx !important;
-        box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
-        background-color: #dad8d8 !important;
-    }
+	// 滚动条整体样式
+	display: block;
+	width: 16rpx !important;
+	height: 16rpx !important;
+	-webkit-appearance: auto !important;
+	background: transparent;
+	overflow: auto !important;
+}
+	
+::v-deep ::-webkit-scrollbar-thumb {
+	// 滚动条里面小方块
+	border-radius: 16rpx !important;
+	box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
+	background-color: #f7f7f7 !important;
+}
+	
+::v-deep ::-webkit-scrollbar-track {
+	// 滚动条
+	border-radius: 16rpx !important;
+	box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
+	background-color: #dad8d8 !important;
+}
+.formInput {
+	width: 90%; 
+	margin-right: 4px;
+	font-size: 14px;
+}
 </style>
\ No newline at end of file
diff --git a/pages/map/index.vue b/pages/map/index.vue
index b720b17..bc2de59 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -147,7 +147,7 @@
         :style="ftype == 1 ? 'margin-top: 18px' : 'margin-top: 80px'"
       >
         <view @click="onJump(3)" class="btn btn6"> 取消 </view>
-        <view @click="handleSubmit" class="btn btn7"> 确定 {{ show }}</view>
+        <view @click="handleSubmit" class="btn btn7"> 确定 </view>
       </view>
     </view>