From 725267388e77b3b5e27bd95ec442f1904a40cea4 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Mon, 7 Apr 2025 07:59:59 +0100 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/apis/{ => trace}/coding.js | 0 .../src/apis/{ => trace}/quality.js | 0 .../src/apis/user.js | 53 ------------------- .../views/trace/agricultural/coding/index.vue | 2 +- .../views/trace/agricultural/coding/info.vue | 2 +- .../views/trace/agricultural/quality/form.vue | 2 +- .../trace/agricultural/quality/index.vue | 2 +- .../src/views/trace/search/info.vue | 2 +- 8 files changed, 5 insertions(+), 58 deletions(-) rename sub-government-affairs-service/src/apis/{ => trace}/coding.js (100%) rename sub-government-affairs-service/src/apis/{ => trace}/quality.js (100%) delete mode 100644 sub-government-affairs-service/src/apis/user.js diff --git a/sub-government-affairs-service/src/apis/coding.js b/sub-government-affairs-service/src/apis/trace/coding.js similarity index 100% rename from sub-government-affairs-service/src/apis/coding.js rename to sub-government-affairs-service/src/apis/trace/coding.js diff --git a/sub-government-affairs-service/src/apis/quality.js b/sub-government-affairs-service/src/apis/trace/quality.js similarity index 100% rename from sub-government-affairs-service/src/apis/quality.js rename to sub-government-affairs-service/src/apis/trace/quality.js diff --git a/sub-government-affairs-service/src/apis/user.js b/sub-government-affairs-service/src/apis/user.js deleted file mode 100644 index 17ca025..0000000 --- a/sub-government-affairs-service/src/apis/user.js +++ /dev/null @@ -1,53 +0,0 @@ -import request from '@/utils/axios'; - -/** - * @Title: 列表 - */ -export function GetEntityList(data, params) { - return request('/store/user/query-user', { - method: 'POST', - data: data, - params: params, - }); -} - -/** - * @Title: 新增 - */ -export function AddEntity(data, params = {}) { - return request('/store/user/add-user', { - method: 'POST', - data: data, - params: params, - }); -} - -/** - * @Title: 修改 - */ -export function UpdateEntity(data, params = {}) { - return request('/store/user/update-user', { - method: 'PUT', - data: data, - params: params, - }); -} - -/** - * @Title: 删除 - */ -export function DeleteEntity(data, params) { - return request('/store/user/del-user', { - method: 'DELETE', - data: data, - params: params, - }); -} - -export function UploadAvatar(data, params) { - return request('/store/self/generate-avatar-pic-upload-url', { - method: 'POST', - data: data, - params: params, - }); -} diff --git a/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue b/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue index 27bc67f..4a62ce5 100644 --- a/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue +++ b/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue @@ -63,7 +63,7 @@ import { isEmpty, imageToBase64, getAssetsFile, downloadFile } from '@/utils'; import { useUserStore } from '@/store/modules/user'; import { CommonUpload } from '@/apis'; import { compact } from 'lodash'; -import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ImportEntity, ExportEntity } from '@/apis/coding'; +import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ImportEntity, ExportEntity } from '@/apis/trace/coding'; import CustomInfo from './info.vue'; import CustomQualityAdd from '../quality/form.vue'; diff --git a/sub-government-affairs-service/src/views/trace/agricultural/coding/info.vue b/sub-government-affairs-service/src/views/trace/agricultural/coding/info.vue index 1ab2cf2..f73fe99 100644 --- a/sub-government-affairs-service/src/views/trace/agricultural/coding/info.vue +++ b/sub-government-affairs-service/src/views/trace/agricultural/coding/info.vue @@ -23,7 +23,7 @@ import { reactive, ref, watch } from 'vue'; import { useApp } from '@/hooks'; import { CRUD_VIEW_OPTIONS } from '@/config'; import { downloadFile } from '@/utils'; -import { GetEntity } from '@/apis/coding'; +import { GetEntity } from '@/apis/trace/coding'; const props = defineProps({ row: { diff --git a/sub-government-affairs-service/src/views/trace/agricultural/quality/form.vue b/sub-government-affairs-service/src/views/trace/agricultural/quality/form.vue index 3bdffc8..c780cbb 100644 --- a/sub-government-affairs-service/src/views/trace/agricultural/quality/form.vue +++ b/sub-government-affairs-service/src/views/trace/agricultural/quality/form.vue @@ -26,7 +26,7 @@ import { reactive, ref, watch } from 'vue'; import { isEmpty, imageToBase64, setUploadField } from '@/utils'; import { useApp } from '@/hooks'; import { CommonUpload } from '@/apis'; -import { AddEntity } from '@/apis/quality'; +import { AddEntity } from '@/apis/trace/quality'; const props = defineProps({ row: { diff --git a/sub-government-affairs-service/src/views/trace/agricultural/quality/index.vue b/sub-government-affairs-service/src/views/trace/agricultural/quality/index.vue index 4199126..0e0086e 100644 --- a/sub-government-affairs-service/src/views/trace/agricultural/quality/index.vue +++ b/sub-government-affairs-service/src/views/trace/agricultural/quality/index.vue @@ -59,7 +59,7 @@ import { useApp } from '@/hooks'; import { CRUD_OPTIONS } from '@/config'; import { isEmpty, imageToBase64, setUploadField, downloadFile } from '@/utils'; import { CommonUpload } from '@/apis'; -import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity } from '@/apis/quality'; +import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity } from '@/apis/trace/quality'; const app = useApp(); const crudRef = ref(null); diff --git a/sub-government-affairs-service/src/views/trace/search/info.vue b/sub-government-affairs-service/src/views/trace/search/info.vue index 14af1bf..4c2d875 100644 --- a/sub-government-affairs-service/src/views/trace/search/info.vue +++ b/sub-government-affairs-service/src/views/trace/search/info.vue @@ -103,7 +103,7 @@ import { useRouter, useRoute } from 'vue-router'; import { useApp } from '@/hooks'; import { CRUD_VIEW_OPTIONS } from '@/config'; import { isEmpty } from '@/utils'; -import { GetTraceDetail } from '@/apis/coding'; +import { GetTraceDetail } from '@/apis/trace/coding'; const { VITE_APP_NAME } = import.meta.env; const router = useRouter(); From 475c32711608e6e3e4be56c3cc547c9deae36f7b Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Mon, 7 Apr 2025 08:38:37 +0100 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/apis/plan.js | 61 ------------------- .../src/apis/{ => resource}/grid.js | 0 .../apis/{ => resource}/statisticAnalysis.js | 0 .../src/views/resource/grid/index.vue | 2 +- .../resource/statisticAnalysis/land/index.vue | 2 +- 5 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 sub-government-affairs-service/src/apis/plan.js rename sub-government-affairs-service/src/apis/{ => resource}/grid.js (100%) rename sub-government-affairs-service/src/apis/{ => resource}/statisticAnalysis.js (100%) diff --git a/sub-government-affairs-service/src/apis/plan.js b/sub-government-affairs-service/src/apis/plan.js deleted file mode 100644 index 617d29c..0000000 --- a/sub-government-affairs-service/src/apis/plan.js +++ /dev/null @@ -1,61 +0,0 @@ -import request from '@/utils/axios'; - -/** - * @Title: 列表 - */ -export function GetEntityList(params = {}) { - return request('/land-resource/annualManage/page', { - method: 'GET', - params, - }); -} - -/** - * @Title: 新增 - */ -export function AddEntity(data = {}) { - return request('/land-resource/annualManage/save', { - method: 'POST', - data, - }); -} - -/** - * @Title: 修改 - */ -export function UpdateEntity(data = {}) { - return request('/land-resource/annualManage/edit', { - method: 'PUT', - data, - }); -} - -/** - * @Title: 审核 - */ -export function AuditEntity(data = {}) { - return request('/land-resource/annualManage/exam', { - method: 'PUT', - data, - }); -} - -/** - * @Title: 删除 - */ -export function DeleteEntity(params = {}) { - return request(`/land-resource/annualManage/delete/${params.id}`, { - method: 'DELETE', - }); -} - -/** - * @Title: 导出 - */ -export function ExportEntity(params = {}) { - return request('/land-resource/annualManage/export', { - method: 'GET', - params, - responseType: 'blob', - }); -} diff --git a/sub-government-affairs-service/src/apis/grid.js b/sub-government-affairs-service/src/apis/resource/grid.js similarity index 100% rename from sub-government-affairs-service/src/apis/grid.js rename to sub-government-affairs-service/src/apis/resource/grid.js diff --git a/sub-government-affairs-service/src/apis/statisticAnalysis.js b/sub-government-affairs-service/src/apis/resource/statisticAnalysis.js similarity index 100% rename from sub-government-affairs-service/src/apis/statisticAnalysis.js rename to sub-government-affairs-service/src/apis/resource/statisticAnalysis.js diff --git a/sub-government-affairs-service/src/views/resource/grid/index.vue b/sub-government-affairs-service/src/views/resource/grid/index.vue index 2a4c7c4..52dd42d 100644 --- a/sub-government-affairs-service/src/views/resource/grid/index.vue +++ b/sub-government-affairs-service/src/views/resource/grid/index.vue @@ -35,7 +35,7 @@ import { CRUD_OPTIONS } from '@/config'; import { isEmpty, downloadFile } from '@/utils'; import { useUserStore } from '@/store/modules/user'; import { compact } from 'lodash'; -import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ExportEntity } from '@/apis/grid'; +import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ExportEntity } from '@/apis/resource/grid'; const { VITE_APP_BASE_API } = import.meta.env; const app = useApp(); diff --git a/sub-government-affairs-service/src/views/resource/statisticAnalysis/land/index.vue b/sub-government-affairs-service/src/views/resource/statisticAnalysis/land/index.vue index fedab7b..6bb2816 100644 --- a/sub-government-affairs-service/src/views/resource/statisticAnalysis/land/index.vue +++ b/sub-government-affairs-service/src/views/resource/statisticAnalysis/land/index.vue @@ -26,7 +26,7 @@