Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

pages/investigation/task.vue

@@ -143,7 +143,8 @@
 				@confirm="pickerxqConfirm"></u-picker>
 			<u-picker :show="showjdPicker" :columns="columnsjdPicker" keyName="label" @cancel="pickerjdCancel"
 				@confirm="pickerjdConfirm"></u-picker>
-
+			<u-picker :show="showtimePicker" :columns="columnstimePicker" keyName="label" @cancel="pickertimeCancel"
+				@confirm="pickertimeConfirm"></u-picker>
 			<!-- 	<view class="echarts" v-if="active === 2">
 				<qiun-data-charts type="area" :opts="opts" :chartData="chartData" />
 			</view> -->
@@ -171,8 +172,12 @@
 					</uni-forms-item>
 					<uni-forms-item label="高峰时段">
 						<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="请输入高峰时段" @focus="focus2" />
+							<view v-if="isEditStep2" class="Height100" :class="formData.peakHours?'':'gary'"
+								@click="showtimePicker=true">
+								{{ formData.peakHours?formData.peakHours:'请选择高峰时段' }}
+							</view>
+							<!-- <input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
+								v-model="formData.peakHours" placeholder="请输入高峰时段" @focus="focus2" /> -->
 							<view class="Height100" v-else>{{ formData.peakHours }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -546,6 +551,16 @@
 						value: ""
 					},
 				],
+				columnstimePicker: [
+					['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时',
+						'15时', '16时', '17时',
+						'18时', '19时', '20时', '21时', '22时', '23时', '24'
+					],
+					['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时',
+						'15时', '16时', '17时',
+						'18时', '19时', '20时', '21时', '22时', '23时', '24时'
+					],
+				],
 				investigationDetailTitle: "title",
 				isEdit: false,
 				isEditStep2: false,
@@ -797,6 +812,7 @@
 
 				],
 				showdlPicker: false,
+				showtimePicker: false,
 				columnsdlPicker: [
 
 				],
@@ -964,6 +980,13 @@
 			pickerdlCancel(e) {
 				this.showdlPicker = false
 			},
+			pickertimeConfirm(e) {
+				this.showtimePicker = false
+				this.$set(this.formData, 'peakHours', e.value[0] + ' - ' + e.value[1])
+			},
+			pickertimeCancel(e) {
+				this.showtimePicker = false
+			},
 			openPicker() {
 
 				this.showPicker = true