Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js

@@ -132,6 +132,15 @@ export const startStation = {
           },
         },
         key: "startStakeMark[0]",
+        rules: [
+          {
+            message: "请补全桩号",
+            callback(value, data) {
+              if (!value?.trim() && data.startStakeMark[1]?.trim()) return false
+              else return true
+            }
+          }
+        ]
       },
       {
         prefix: {
@@ -140,7 +149,7 @@ export const startStation = {
             color: "#3DE8FF",
           },
         },
-        key: "startStakeMark[1]",
+        key: "startStakeMark[1]"
       },
     ],
   }
@@ -161,6 +170,15 @@ export const endStation = {
           },
         },
         key: "endStakeMark[0]",
+        rules: [
+          {
+            message: "请补全桩号",
+            callback(value, data) {
+              if (!value?.trim() && data.endStakeMark[1]?.trim()) return false
+              else return true
+            }
+          }
+        ]
       },
       {
         prefix: {

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue

@@ -22,7 +22,13 @@
         </ButtonGradient>
       </div>
 
-      <InputSearch style="width: 402px;" :formList="searchFormList" :formConfigOptions="{ labelWidth: '90px' }"
+      <InputSearch 
+        style="width: 402px;" 
+        :formList="searchFormList" 
+        :formConfigOptions="{ labelWidth: '90px' }"
+        placeholder="请输入线路名称，回车搜索"
+        type="input"
+        :params="params"
         @handleSearch="handleSearch" />
     </div>
 
@@ -120,7 +126,8 @@ export default {
       data: [],
       dialogData: null,
       editEventInformationDialogVisible: false,
-      isFirst: true
+      isFirst: true,
+      params: "sectionName",
     }
   },
   created() {
@@ -134,11 +141,23 @@ export default {
         ...this.getPagination()
       };
 
-      if (this.searchData?.startStakeMark) result.startStakeMark = `K${this.searchData?.startStakeMark}`;
+      result.startStakeMark = this.joinStakeMark(this.searchData?.startStakeMark);
-      if (this.searchData?.endStakeMark) result.endStakeMark = `K${this.searchData?.endStakeMark}`;
+      result.endStakeMark = this.joinStakeMark(this.searchData?.endStakeMark);
 
       return result
     },
+    //拼接桩号搜索条件
+    joinStakeMark(datas) {
+      console.log("stakeMarks:",datas);
+      let stakeMark = null;
+      if (datas && datas[0]) {
+        if(!datas[1]){
+          datas[1] = 0;
+        }
+        stakeMark = `K${datas[0]}+${datas[1]}`;
+      }
+      return stakeMark;
+    },
     async handleDelete(data) {
       await confirm({ message: "是否要删除该辖段信息?" });