总体增加弹窗拖拽功能

frontend-sjgl/src/api/DataQueryMenuModule/index.ts

@@ -16,6 +16,15 @@ export function getPowerTableList(data) {
     data
   });
 }
+// 基础信息 新增
+export function addPowerInfo(data) {
+  return request({
+    url: '/env/engInfo/add',
+    method: 'post',
+    data
+  });
+}
+
 // 基础信息 编辑
 export function updatePowerInfo(data) {
   return request({

frontend-sjgl/src/views/conventionalHydropower/BasicData/BasicDataSearch.vue

@@ -74,6 +74,7 @@
         <a-checkbox-group v-model:value="dvtp" :options="dvtpList" />
       </template>
       <template #actions>
+        <a-button type="primary" @click="handleAdd">新增</a-button>
         <a-button :loading="btnLoading" @click="exportBtn">导出</a-button>
         <a-button @click="customFilterBtn">自定义筛选列</a-button>
         <a-button @click="hideBtn">{{ isHide ? '展开' : '隐藏' }}</a-button>
@@ -94,6 +95,7 @@ const emit = defineEmits<{
   (e: 'custom-filter-btn'): void;
   (e: 'reset', values: any): void;
   (e: 'search-finish', values: any): void;
+  (e: 'add'): void;
 }>();
 
 interface Props {
@@ -285,6 +287,10 @@ const exportBtn = () => {
   emit('export-btn');
 };
 
+const handleAdd = () => {
+  emit('add');
+};
+
 const onValuesChange = (changedValues: any, allValues: any) => {
   searchData.value = { ...searchData.value, ...allValues };
 };

frontend-sjgl/src/views/conventionalHydropower/BasicData/EditPowerModal.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     v-model:open="visible"
-    title="编辑电站"
+    :title="isAdd ? '新增电站' : '编辑电站'"
     width="80vw"
     :confirm-loading="confirmLoading"
     @ok="handleOk"
@@ -1083,15 +1083,17 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue';
 import { message } from 'ant-design-vue';
-import { updatePowerInfo } from '@/api/DataQueryMenuModule';
+import { addPowerInfo, updatePowerInfo } from '@/api/DataQueryMenuModule';
 import { BasicColumns } from '@/components/MapModal/column.config';
 import { getRvcdDropdown, getAddvcdDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
   record?: any;
+  isAdd?: boolean;
   topHynmList?: any[];
   hycdList?: any[];
   dvtpList?: any[];
@@ -1104,6 +1106,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 watch(
   () => props.open,
   val => {
@@ -1312,7 +1315,7 @@ const handleOk = async () => {
   try {
     await formRef.value?.validateFields();
 
-    if (changeOrder.value.length === 0) {
+    if (!props.isAdd && changeOrder.value.length === 0) {
       message.info('未检测到任何修改');
       return;
     }
@@ -1327,24 +1330,35 @@ const handleOk = async () => {
 const handleConfirmSubmit = async (source: string) => {
   confirmLoading.value = true;
   try {
-    // 只传修改过的字段 + stcd
-    const engInfo: Record<string, any> = {
-      stcd: formData.value.stcd
-    };
-    changeOrder.value.forEach(item => {
-      engInfo[item.field] = formData.value[item.field];
-    });
-    const res = await updatePowerInfo({
-      engInfo,
-      source: source.trim()
-    });
+    let res: any;
+    if (props.isAdd) {
+      // 新增时提交所有字段
+      const engInfo: Record<string, any> = {};
+      Object.assign(engInfo, formData.value);
+      res = await addPowerInfo({
+        engInfo,
+        source: source.trim() || '新增'
+      });
+    } else {
+      // 编辑时只传修改过的字段 + stcd
+      const engInfo: Record<string, any> = {
+        stcd: formData.value.stcd
+      };
+      changeOrder.value.forEach(item => {
+        engInfo[item.field] = formData.value[item.field];
+      });
+      res = await updatePowerInfo({
+        engInfo,
+        source: source.trim()
+      });
+    }
     if (res?.code == 0 || res?.success) {
-      message.success('编辑成功');
+      message.success(props.isAdd ? '新增成功' : '编辑成功');
       confirmModalVisible.value = false;
       visible.value = false;
       emit('success');
     } else {
-      message.error(res?.msg || '编辑失败');
+      message.error(res?.msg || (props.isAdd ? '新增失败' : '编辑失败'));
     }
   } catch (error) {
     console.error('提交失败:', error);

frontend-sjgl/src/views/conventionalHydropower/BasicData/index.vue

@@ -7,6 +7,7 @@
       :topHynmLoading="topHynmLoading"
       :hycdLoading="hycdLoading"
       :dvtpList="dvtpList"
+      @add="handleAdd"
       @export-btn="exportBtn"
       @custom-filter-btn="customFilterBtn"
       @search-finish="onSearchFinish"
@@ -78,6 +79,7 @@ import DeleteConfirmModal from './DeleteConfirmModal.vue';
 import {
   getCompanyList,
   getPowerTableList,
+  addPowerInfo,
   updatePowerInfo,
   deletePowerInfo
 } from '@/api/DataQueryMenuModule';
@@ -117,6 +119,7 @@ const customColumnVisible = ref(false);
 // 编辑相关
 const editVisible = ref(false);
 const editRecord = ref<any>(null);
+const isAdd = ref(false);
 const deleteModalRef = ref();
 
 // 集团和公司数据
@@ -1026,8 +1029,15 @@ const handleDetail = (record: any) => {
   modelStore.params.stcd = record.stcd;
   modelStore.title = record.stnm;
 };
+// 新增
+const handleAdd = () => {
+  isAdd.value = true;
+  editRecord.value = null;
+  editVisible.value = true;
+};
 // 编辑
 const handleEdit = (record: any) => {
+  isAdd.value = false;
   getEngInfoById({ stcd: record.stcd }).then(res => {
     console.log(res);
     editRecord.value = { ...res.data };

frontend-sjgl/src/views/conventionalHydropower/aiBox/EditAiBoxModal.vue

@@ -244,6 +244,7 @@ import { addAiboxInfo, updateAiboxInfo } from '@/api/DataQueryMenuModule';
 import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -258,6 +259,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/aquaEco/EditOtweModal.vue

@@ -210,6 +210,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -224,6 +225,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/fishSurvey/EditFishModal.vue

@@ -254,6 +254,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -268,6 +269,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/guoYuSheShi/EditFpModal.vue

@@ -145,12 +145,14 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{ open: boolean; record?: any; isAdd?: boolean }>();
 const emit = defineEmits(['update:open', 'success']);
 const jidiSelectEventStore = useJidiSelectEventStore();
 
 const visible = computed({ get: () => props.open, set: val => emit('update:open', val) });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/luShengShengTaiDiaoCha/EditTeModal.vue

@@ -148,6 +148,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -162,6 +163,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/photoBase/EditPhotoModal.vue

@@ -189,6 +189,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -203,6 +204,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/qiXiDi/EditFhModal.vue

@@ -105,12 +105,14 @@ import { addFhInfo, updateFhInfo } from '@/api/DataQueryMenuModule';
 import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{ open: boolean; record?: any; isAdd?: boolean }>();
 const emit = defineEmits(['update:open', 'success']);
 const jidiSelectEventStore = useJidiSelectEventStore();
 
 const visible = computed({ get: () => props.open, set: val => emit('update:open', val) });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/rescueStation/EditVaModal.vue

@@ -221,6 +221,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -235,6 +236,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/shengTaiLiuLiang/EditEqModal.vue

@@ -117,12 +117,14 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{ open: boolean; record?: any; isAdd?: boolean }>();
 const emit = defineEmits(['update:open', 'success']);
 const jidiSelectEventStore = useJidiSelectEventStore();
 
 const visible = computed({ get: () => props.open, set: val => emit('update:open', val) });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/shiPinJianKong/EditVdModal.vue

@@ -58,12 +58,14 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{ open: boolean; record?: any; isAdd?: boolean }>();
 const emit = defineEmits(['update:open', 'success']);
 const jidiSelectEventStore = useJidiSelectEventStore();
 
 const visible = computed({ get: () => props.open, set: val => emit('update:open', val) });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/shuiShengShengTaiDiaoCha/EditWeModal.vue

@@ -148,6 +148,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -162,6 +163,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/shuiWenJianCe/EditWtModal.vue

@@ -143,6 +143,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -157,6 +158,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/shuiZhiJianCe/EditWqModal.vue

@@ -174,6 +174,7 @@ import { getDictItemsByCode } from '@/api/dict';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -188,6 +189,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/sonarCam/EditSonarModal.vue

@@ -209,6 +209,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -223,6 +224,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/spawnGround/EditSpawnModal.vue

@@ -231,6 +231,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -245,6 +246,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/tempMit/EditDwModal.vue

@@ -202,6 +202,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -216,6 +217,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/terrEco/EditOtteModal.vue

@@ -210,6 +210,7 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -224,6 +225,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/yunXingGaoJing/EditWarnModal.vue

@@ -138,6 +138,7 @@ import { addWarnInfo, updateWarnInfo } from '@/api/DataQueryMenuModule';
 import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{
   open: boolean;
@@ -152,6 +153,7 @@ const visible = computed({
   get: () => props.open,
   set: val => emit('update:open', val)
 });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/zengZhiFangLiu/EditFbModal.vue

@@ -120,12 +120,14 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{ open: boolean; record?: any; isAdd?: boolean }>();
 const emit = defineEmits(['update:open', 'success']);
 const jidiSelectEventStore = useJidiSelectEventStore();
 
 const visible = computed({ get: () => props.open, set: val => emit('update:open', val) });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);

frontend-sjgl/src/views/conventionalHydropower/zhenXIZhiWuYuan/EditVpModal.vue

@@ -78,12 +78,14 @@ import { getEngInfoDropdown } from '@/api/select';
 import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
 import { sttpGetKendoList } from '@/api/system/map/ConfigManagement';
 import ConfirmModal from '@/components/ConfirmModal/index.vue';
+import { useDraggable } from '@/utils/drag';
 
 const props = defineProps<{ open: boolean; record?: any; isAdd?: boolean }>();
 const emit = defineEmits(['update:open', 'success']);
 const jidiSelectEventStore = useJidiSelectEventStore();
 
 const visible = computed({ get: () => props.open, set: val => emit('update:open', val) });
+useDraggable(visible, { boundary: true, resetOnOpen: true });
 
 const formRef = ref();
 const confirmLoading = ref(false);