diff --git a/frontend-sjgl/src/api/DataQueryMenuModule/index.ts b/frontend-sjgl/src/api/DataQueryMenuModule/index.ts
index cb4498e5..fd50ef31 100644
--- a/frontend-sjgl/src/api/DataQueryMenuModule/index.ts
+++ b/frontend-sjgl/src/api/DataQueryMenuModule/index.ts
@@ -388,6 +388,33 @@ export function getFishReleaseList(data) {
});
}
+// 鱼类放鱼 - 详情查询
+export function getFishReleaseDetailList(data) {
+ return request({
+ url: '/fb/fishrun/qgc/detail/GetKendoListCust',
+ method: 'post',
+ data
+ });
+}
+
+// 鱼类放鱼 - 详情删除
+export function deleteFishRunQgcDetailData(data) {
+ return request({
+ url: '/fb/fishrun/qgc/removeFishRunQgcDetailData',
+ method: 'post',
+ data
+ });
+}
+
+// 鱼类放鱼 - 详情修改
+export function updateFishRunQgcDetailData(data) {
+ return request({
+ url: '/fb/fishrun/qgc/updateFishRunQgcDetailData',
+ method: 'post',
+ data
+ });
+}
+
// 流量站 - 断面
export function getFlowStationSectionList(data) {
return request({
diff --git a/frontend-sjgl/src/components/ConfirmModal/index.vue b/frontend-sjgl/src/components/ConfirmModal/index.vue
index 2eb85368..a70641ed 100644
--- a/frontend-sjgl/src/components/ConfirmModal/index.vue
+++ b/frontend-sjgl/src/components/ConfirmModal/index.vue
@@ -35,7 +35,7 @@
diff --git a/frontend-sjgl/src/components/OperationLogModal/index.vue b/frontend-sjgl/src/components/OperationLogModal/index.vue
index f76ccf0e..bfaf6643 100644
--- a/frontend-sjgl/src/components/OperationLogModal/index.vue
+++ b/frontend-sjgl/src/components/OperationLogModal/index.vue
@@ -82,10 +82,16 @@ import { useDraggable } from "@/utils/drag";
defineOptions({ name: "OperationLogModal" });
-const props = defineProps<{
- open: boolean;
- tableName: string;
-}>();
+const props = withDefaults(
+ defineProps<{
+ open: boolean;
+ tableName: string;
+ recordNameTitle?: string;
+ }>(),
+ {
+ recordNameTitle: "电站",
+ }
+);
const emit = defineEmits(["update:open"]);
@@ -129,10 +135,10 @@ const searchList: any = [
];
// 表格列配置
-const columns = ref([
+const columns = computed(() => [
{
key: "recordName",
- title: "电站",
+ title: props.recordNameTitle,
dataIndex: "recordName",
visible: true,
width: 120,
@@ -151,11 +157,8 @@ const columns = ref([
dataIndex: "operateTime",
visible: true,
width: 160,
- customRender: ({ text }: { text: string }) => {
- if (!text || text === "-") return "-";
- const date = dayjs(text);
- return date.isValid() ? date.format("YYYY-MM-DD") : "-";
- },
+ sort: true,
+
},
{
key: "source",
diff --git a/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue b/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
index b7501d84..6af4926a 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue
@@ -76,6 +76,7 @@
diff --git a/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue b/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue
index 3a52cd82..b70cf893 100644
--- a/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue
+++ b/frontend-sjgl/src/views/conventionalHydropower/FishResource/index.vue
@@ -123,7 +123,7 @@
@success="handleEditSuccess"
/>
-
+
diff --git a/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseDetailModal.vue b/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseDetailModal.vue
index e847e317..d6f28b44 100644
--- a/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseDetailModal.vue
+++ b/frontend-sjgl/src/views/monitorData/FishRelease/FishReleaseDetailModal.vue
@@ -5,84 +5,22 @@
width="90vw"
:footer="null"
>
-
-
-
-
-
-
-
-
- 至
-
-
-
-
-
-
-
-
-
- 批量删除
-
-
+
@@ -119,13 +57,14 @@
+
diff --git a/frontend-sjgl/src/views/monitorData/FishRelease/index.vue b/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
index f09d6eff..124ce0e7 100644
--- a/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
+++ b/frontend-sjgl/src/views/monitorData/FishRelease/index.vue
@@ -35,12 +35,14 @@
@@ -247,6 +249,11 @@ const handleDetail = (record: any) => {
detailVisible.value = true;
};
+// 详情弹窗内修改/删除成功后刷新页面表格
+const handleDetailSuccess = () => {
+ initTable(currentSearchParams.value);
+};
+
onMounted(() => {
nextTick(() => {
tableScrollY.value = calcTableScrollY();
diff --git a/frontend-sjgl/src/views/monitorData/FlowStation/EditFlowStationModal.vue b/frontend-sjgl/src/views/monitorData/FlowStation/EditFlowStationModal.vue
index 75e38474..05ca621a 100644
--- a/frontend-sjgl/src/views/monitorData/FlowStation/EditFlowStationModal.vue
+++ b/frontend-sjgl/src/views/monitorData/FlowStation/EditFlowStationModal.vue
@@ -215,6 +215,7 @@ watch(
q: null,
v: null
};
+ sourceValue.value = '';
return;
}
@@ -273,6 +274,7 @@ const handleConfirmSubmit = async () => {
if (res?.code == 0 || res?.success) {
message.success('编辑成功');
confirmModalVisible.value = false;
+ sourceValue.value = '';
visible.value = false;
emit('success');
} else {
diff --git a/frontend-sjgl/src/views/monitorData/FlowStation/index.vue b/frontend-sjgl/src/views/monitorData/FlowStation/index.vue
index 894cd940..bf8a36fe 100644
--- a/frontend-sjgl/src/views/monitorData/FlowStation/index.vue
+++ b/frontend-sjgl/src/views/monitorData/FlowStation/index.vue
@@ -65,6 +65,7 @@
diff --git a/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue b/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue
index 5386342f..1b423886 100644
--- a/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue
+++ b/frontend-sjgl/src/views/monitorData/SurfaceTemp/index.vue
@@ -65,6 +65,7 @@
diff --git a/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue b/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
index 0a59e054..f8c5d3c5 100644
--- a/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
+++ b/frontend-sjgl/src/views/monitorData/VerticalTemp/index.vue
@@ -104,6 +104,7 @@
diff --git a/frontend-sjgl/src/views/monitorData/WaterData/index.vue b/frontend-sjgl/src/views/monitorData/WaterData/index.vue
index fc09e421..e9c15078 100644
--- a/frontend-sjgl/src/views/monitorData/WaterData/index.vue
+++ b/frontend-sjgl/src/views/monitorData/WaterData/index.vue
@@ -67,6 +67,7 @@