diff --git a/main/.env.development b/main/.env.development index a332768..328aab0 100644 --- a/main/.env.development +++ b/main/.env.development @@ -12,5 +12,6 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.14:8080'//线下测试 VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' \ No newline at end of file diff --git a/main/src/views/login/index.vue b/main/src/views/login/index.vue index a11cc1a..78e67eb 100644 --- a/main/src/views/login/index.vue +++ b/main/src/views/login/index.vue @@ -16,7 +16,7 @@ - + 记住密码 @@ -61,13 +61,13 @@ export default { username: 'admin', password: 'admin123', rememberMe: false, - code: '', + code: '1', uuid: '', }, loginRules: { username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }], password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }], - code: [{ required: true, trigger: 'change', message: '请输入验证码' }], + // code: [{ required: true, trigger: 'change', message: '请输入验证码' }], }, loading: false, // 验证码开关 diff --git a/main/vite.config.js b/main/vite.config.js index 39d8c37..e836ec8 100644 --- a/main/vite.config.js +++ b/main/vite.config.js @@ -31,14 +31,14 @@ export default defineConfig(({ command, mode }) => { 'Access-Control-Allow-Origin': '*', }, proxy: { - // 仅 Brand 模块走子应用 DevServer - '/api/brand': { - target: 'http://localhost:9526', - changeOrigin: true, - // 如果想去掉 /api/brand 前缀(比如子应用实际监听的是 /brand/...), - // 可以加一个 rewrite: - // rewrite: path => path.replace(/^\/api\/brand/, '/brand'), - }, + // // 仅 Brand 模块走子应用 DevServer + // '/api/brand': { + // target: 'http://localhost:9526', + // changeOrigin: true, + // // 如果想去掉 /api/brand 前缀(比如子应用实际监听的是 /brand/...), + // // 可以加一个 rewrite: + // // rewrite: path => path.replace(/^\/api\/brand/, '/brand'), + // }, [VITE_APP_BASE_API]: { target: VITE_APP_BASE_URL, changeOrigin: true, diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 187aabc..ec64d21 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -6,5 +6,7 @@ VITE_APP_MIAN_URL = 'http://localhost:9000' VITE_APP_NAME = 'sub-government-affairs-service' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.14:8080' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.14:8080' \ No newline at end of file diff --git a/sub-government-affairs-service/.env.production b/sub-government-affairs-service/.env.production index fa327e9..63cf3cc 100644 --- a/sub-government-affairs-service/.env.production +++ b/sub-government-affairs-service/.env.production @@ -1,7 +1,8 @@ # 生产环境 VITE_MODE = 'PRO' VITE_APP_MIAN = 'daimp-front-main' -VITE_APP_MIAN_URL = 'http://47.109.205.240:88' +# VITE_APP_MIAN_URL = 'http://47.109.205.240:88' +VITE_APP_MIAN_URL = 'http://192.168.18.14:8080' VITE_APP_NAME = 'sub-government-affairs-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-government-affairs-service/src/apis/resource/member.js b/sub-government-affairs-service/src/apis/resource/member.js new file mode 100644 index 0000000..0203631 --- /dev/null +++ b/sub-government-affairs-service/src/apis/resource/member.js @@ -0,0 +1,54 @@ +import request from '@/utils/axios'; + +// 获取网格列表 +export const GetGridList = (params = {}) => { + return request('/land-resource/gridManage/page', { + method: 'get', + params, + }); +}; + +// 网格员管理 - 列表 +export function GetMemberList(params = {}) { + return request('/land-resource/grid-member/page', { + method: 'GET', + params, + }); +} + +// 网格员管理 - 新增 +export function AddMember(data = {}) { + return request('/land-resource/grid-member', { + method: 'POST', + data, + }); +} + +// 网格员管理 - 修改 +export function UpdateMember(data = {}) { + return request('/land-resource/grid-member', { + method: 'PUT', + data, + }); +} + +// 网格员管理 - 删除 +export function DeleteMember(id) { + return request(`/land-resource/grid-member/${id}`, { + method: 'DELETE', + }); +} + +// // 网格员管理 - 导出 +// export function ExportMember() { +// return request('/land-resource/grid-member/export', { +// method: 'POST', +// }); +// } +export function ExportMember(data = {}) { + return request('/land-resource/grid-member/export', { + method: 'POST', + data, + responseType: 'blob', // 明确告诉 axios 返回 blob + }); +} diff --git a/sub-government-affairs-service/src/assets/images/logo.png b/sub-government-affairs-service/src/assets/images/logo.png new file mode 100644 index 0000000..3d7da94 Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/logo.png differ diff --git a/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue b/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue index d21ba91..5f84d1e 100644 --- a/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue @@ -1,10 +1,3 @@ -