diff --git a/main/.env.development b/main/.env.development index 3a87c67..6335034 100644 --- a/main/.env.development +++ b/main/.env.development @@ -3,8 +3,9 @@ VITE_PORT = 9000 VITE_APP_NAME = 'daimp-front-main' VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//localhost:9526/sub-operation-service/' -VITE_APP_SUB_ADMIN = '//localhost:9527/sub-admin/' +VITE_APP_SUB_OA = '//localhost:9527/sub-operation-admin/' VITE_APP_SUB_GAS = '//localhost:9528/sub-government-affairs-service/' +VITE_APP_SUB_GAA = '//localhost:9525/sub-government-affairs-admin/' VITE_APP_SUB_GSS = '//localhost:9529/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/.env.production b/main/.env.production index 8bc7168..c8d1172 100644 --- a/main/.env.production +++ b/main/.env.production @@ -2,8 +2,9 @@ VITE_APP_NAME = 'daimp-front-main' VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//192.168.18.99:88/sub-operation-service/' -VITE_APP_SUB_ADMIN = '//192.168.18.99:88/sub-admin/' +VITE_APP_SUB_OA = '//192.168.18.99:88/sub-operation-admin/' VITE_APP_SUB_GAS = '//192.168.18.99:88/sub-government-affairs-service/' +VITE_APP_SUB_GAA = '//192.168.18.99:88/sub-government-affairs-admin/' VITE_APP_SUB_GSS = '//192.168.18.99:88/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/.env.test b/main/.env.test index 5b7db1a..014e47a 100644 --- a/main/.env.test +++ b/main/.env.test @@ -1,12 +1,13 @@ -# 开发环境 +# 测试环境 VITE_APP_NAME = 'daimp-front-main' VITE_APP_TITLE = '数字农业产业管理平台' -VITE_APP_SUB_OS = '//localhost:8090/sub-operation-service/' -VITE_APP_SUB_ADMIN = '//localhost:8090/sub-admin/' -VITE_APP_SUB_GAS = '//localhost:8090/sub-government-affairs-service/' -VITE_APP_SUB_GSS = '//localhost:8090/sub-government-screen-service/' +VITE_APP_SUB_OS = '//192.168.18.99:88/sub-operation-service/' +VITE_APP_SUB_OA = '//192.168.18.99:88/sub-operation-admin/' +VITE_APP_SUB_GAS = '//192.168.18.99:88/sub-government-affairs-service/' +VITE_APP_SUB_GAA = '//192.168.18.99:88/sub-government-affairs-admin/' +VITE_APP_SUB_GSS = '//192.168.18.99:88/sub-government-screen-service/' # 接口 -VITE_APP_BASE_API = '/apis' +VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = '' diff --git a/main/package.json b/main/package.json index 3a1126f..377b040 100644 --- a/main/package.json +++ b/main/package.json @@ -7,6 +7,7 @@ "dev": "vite --mode development", "build": "vite build --mode production", "test": "vite build --mode test", + "local": "vite build --mode local", "preview": "vite preview", "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'", "eslint": "npx eslint --init", diff --git a/sub-government-affairs-service/package.json b/sub-government-affairs-service/package.json index 9206f9e..1620349 100644 --- a/sub-government-affairs-service/package.json +++ b/sub-government-affairs-service/package.json @@ -7,6 +7,7 @@ "dev": "vite --mode development", "build": "vite build --mode production", "test": "vite build --mode test", + "local": "vite build --mode local", "preview": "vite preview", "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'", "eslint": "npx eslint --init", 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/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/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 @@