Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisaster.vue

@@ -15,11 +15,20 @@
         <span>校准时间</span>
       </div>
 
+      <BasePicker
+        v-model="routeFilterForm.routeType"
+        :options="options['roadType']"
+        label="路线类型"
+        placeholder="请选择"
+        @change="handleRouteTypeChange"
+      />
+
       <!-- 线路编号 (顶层 routeNo) -->
       <RoadRoutesPicker
         v-model="formData.event.routeNo"
         label="线路编号"
         placeholder="请选择"
+        :extra-params="{ xzdj: routeFilterForm.routeType }"
         @change="handleRouteNoChange"
       />
 
@@ -192,6 +201,10 @@ const formData = ref({
   yhzMaterialList: [],
 });
 
+const routeFilterForm = ref({
+  routeType: '',
+});
+
 const parsePointValue = point => {
   if (!point) {
     return { longitude: null, latitude: null };
@@ -221,6 +234,20 @@ const parsePointValue = point => {
   return { longitude: null, latitude: null };
 };
 
+const resetRouteFields = () => {
+  formData.value.event.routeNo = '';
+  formData.value.event.startStakeNo = '';
+  formData.value.event.startStakeLng = '';
+  formData.value.event.startStakeLat = '';
+  formData.value.event.endStakeNo = '';
+  formData.value.event.endStakeLng = '';
+  formData.value.event.endStakeLat = '';
+};
+
+const handleRouteTypeChange = () => {
+  resetRouteFields();
+};
+
 const handleRouteNoChange = (item = {}) => {
   formData.value.event.routeNo = item.routeCode;
   formData.value.event.startStakeNo = item.startStakeNo;

packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue

@@ -29,8 +29,22 @@
           <span>校准时间</span>
         </div>
 
+        <BasePicker
+          v-model="routeFilterForm.routeType"
+          :options="options['roadType']"
+          label="路线类型"
+          placeholder="请选择"
+          @change="handleRouteTypeChange"
+        />
+
         <!-- 线路编号 (顶层 routeNo) -->
-        <RoadRoutesPicker v-model="formData.event.routeNo" label="线路编号" placeholder="请选择" @change="handleRouteNoChange" />
+        <RoadRoutesPicker
+          v-model="formData.event.routeNo"
+          label="线路编号"
+          placeholder="请选择"
+          :extra-params="{ xzdj: routeFilterForm.routeType }"
+          @change="handleRouteNoChange"
+        />
 
         <!-- 起点桩号 (event.startStakeNo) -->
         <van-field v-model="formData.event.startStakeNo" label="起点桩号(K)" placeholder="请填写" />
@@ -204,6 +218,10 @@ const formData = ref({
   fileList: []
 })
 
+const routeFilterForm = ref({
+  routeType: ''
+})
+
 const submitting = ref(false)
 
 // 时间选择器范围
@@ -251,6 +269,20 @@ const parsePointValue = (point) => {
   return { longitude: null, latitude: null }
 }
 
+const resetRouteFields = () => {
+  formData.value.event.routeNo = ''
+  formData.value.event.startStakeNo = ''
+  formData.value.event.startStakeLng = ''
+  formData.value.event.startStakeLat = ''
+  formData.value.event.endStakeNo = ''
+  formData.value.event.endStakeLng = ''
+  formData.value.event.endStakeLat = ''
+}
+
+const handleRouteTypeChange = () => {
+  resetRouteFields()
+}
+
 const handleRouteNoChange = (item) => {
   formData.value.event.routeNo = item.routeCode
   formData.value.event.startStakeNo = item.startStakeNo

packages/mobile/src/views/DisasterManagement/components/RoadRoutesPicker.vue

@@ -7,7 +7,7 @@
       </span>
       <van-icon name="arrow-down" class="selector-icon" />
     </div> -->
-    <van-field :modelValue="modelValue" is-link readonly :label="label" :placeholder="placeholder" :rules="rules" :required="required" @click="showPicker = true" />
+    <van-field :modelValue="modelValue" is-link readonly :label="label" :placeholder="placeholder" :rules="rules" :required="required" @click="openPicker" />
 
     <!-- 移动端弹出层（使用 van-action-sheet + 内部列表） -->
     <van-action-sheet v-model:show="showPicker" :title="dialogTitle" :close-on-click-action="false" round :style="{ maxHeight: '80vh' }" @close="handlePickerClose">