diff --git a/frontend/src/api/select/index.ts b/frontend/src/api/select/index.ts
index d322e8e1..d52bcf9d 100644
--- a/frontend/src/api/select/index.ts
+++ b/frontend/src/api/select/index.ts
@@ -41,6 +41,14 @@ export function getEngInfoDropdown(data: any) {
data
});
}
+// 根据河段获取电站
+export function getByRvcd(data: any) {
+ return request({
+ url: '/env/engInfo/getByRvcd',
+ method: 'get',
+ params:data
+ });
+}
// 根据id获取电站信息
export function getEngInfoById(params: any) {
return request({
diff --git a/frontend/src/api/system/map/pushManagement/index.ts b/frontend/src/api/system/map/pushManagement/index.ts
index 0c12c515..f6f3b6ae 100644
--- a/frontend/src/api/system/map/pushManagement/index.ts
+++ b/frontend/src/api/system/map/pushManagement/index.ts
@@ -70,7 +70,7 @@ export function setPushConfigSmsSwitch(data: any) {
return request({
url: '/system/pushConfig/setPushConfigSmsSwitch',
method: 'post',
- data
+ params:data
});
}
//获取推送历史列表
diff --git a/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementForm.vue b/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementForm.vue
index 32f1179d..7c2d4074 100644
--- a/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementForm.vue
+++ b/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementForm.vue
@@ -23,19 +23,33 @@
placeholder="请输入倾斜影像名称"
/>
-
-
+
-
-
+
+
-
+
diff --git a/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementSearch.vue b/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementSearch.vue
index 1a5623b8..e518bcb7 100644
--- a/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementSearch.vue
+++ b/frontend/src/views/system/map/components/TiltPhotoManagement/TiltPhotoManagementSearch.vue
@@ -23,6 +23,8 @@ import BasicSearch from "@/components/BasicSearch/index.vue";
interface Props {
handleAdd: () => void;
+ riverOptions: any[];
+ riverOptionsLoad: boolean;
}
const props = defineProps();
@@ -34,6 +36,7 @@ const emit = defineEmits<{
const initSearchData = {
stnm: "",
+ rvcd:""
};
const searchData = ref({ ...initSearchData });
@@ -47,13 +50,16 @@ const searchList: any = computed(() => [
},
},
{
- type: "Select",
- name: "hbrvcdName",
- label: "所在河段",
+ type: 'Select',
+ name: 'rvcd',
+ label: '所在河段',
+ width: 300,
fieldProps: {
- allowClear: true,
+ allowClear: true
},
- },
+ options: props.riverOptions,
+ loading: props.riverOptionsLoad
+ }
]);
const onSearchFinish = (values: any) => {
diff --git a/frontend/src/views/system/map/components/TiltPhotoManagement/index.vue b/frontend/src/views/system/map/components/TiltPhotoManagement/index.vue
index d2e4b4be..de08fae8 100644
--- a/frontend/src/views/system/map/components/TiltPhotoManagement/index.vue
+++ b/frontend/src/views/system/map/components/TiltPhotoManagement/index.vue
@@ -3,6 +3,8 @@
{
operator: 'contains',
dataType: 'string',
value: values.stnm
+ },
+ {
+ field: 'rvcd',
+ operator: 'contains',
+ dataType: 'string',
+ value: values.rvcd
}
].filter(Boolean)
};
@@ -211,7 +223,20 @@ const handleEditSubmit = async (values: any) => {
return;
}
};
-const initOption = async () => {};
+const riverOptions = ref([]);
+const riverOptionsLoad = ref(false);
+const initOption = () => {
+ const params = {};
+ riverOptionsLoad.value = true;
+ getRvcdDropdown(params).then((res: any) => {
+ res.data.forEach((item: any) => {
+ item.value = item.rvcd;
+ item.label = item.rvnm;
+ });
+ riverOptions.value = res.data || [];
+ riverOptionsLoad.value = false;
+ });
+};
onMounted(() => {
initOption();
});
diff --git a/frontend/src/views/system/pushManagement/components/ConfigManagement/index.vue b/frontend/src/views/system/pushManagement/components/ConfigManagement/index.vue
index 01fc94ce..46b833db 100644
--- a/frontend/src/views/system/pushManagement/components/ConfigManagement/index.vue
+++ b/frontend/src/views/system/pushManagement/components/ConfigManagement/index.vue
@@ -18,7 +18,8 @@
@@ -67,7 +68,7 @@