diff --git a/sub-government-affairs-service/.env.production b/sub-government-affairs-service/.env.production index 18d39dd..9beaf0f 100644 --- a/sub-government-affairs-service/.env.production +++ b/sub-government-affairs-service/.env.production @@ -1,7 +1,7 @@ # 生产环境 VITE_MODE = 'PRO' VITE_APP_MIAN = 'daimp-front-main' -VITE_APP_MIAN_URL = 'http://47.109.205.240:80' +VITE_APP_MIAN_URL = 'http://47.109.205.240' VITE_APP_NAME = 'sub-government-affairs-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-government-affairs-service/src/router/modules/system.js b/sub-government-affairs-service/src/router/modules/system.js index b126699..3644054 100644 --- a/sub-government-affairs-service/src/router/modules/system.js +++ b/sub-government-affairs-service/src/router/modules/system.js @@ -26,6 +26,13 @@ export default [ name: 'system-role', meta: { title: '角色管理', icon: 'Document' }, }, + { + path: '/sub-government-affairs-service/system-auth-user', + component: () => import('@/views/system/role/authUser.vue'), + name: 'system-auth-user', + meta: { title: '分配用户', icon: 'Document' }, + hidden: true, + }, { path: '/sub-government-affairs-service/system-menu', component: () => import('@/views/system/menu/index.vue'), diff --git a/sub-government-affairs-service/src/utils/axios.js b/sub-government-affairs-service/src/utils/axios.js index fae49b5..80e8d6a 100644 --- a/sub-government-affairs-service/src/utils/axios.js +++ b/sub-government-affairs-service/src/utils/axios.js @@ -3,7 +3,7 @@ * @Author: zenghua.wang * @Date: 2022-02-23 21:12:37 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-03-26 10:02:18 + * @LastEditTime: 2025-04-08 15:36:24 */ import axios from 'axios'; import { ElNotification } from 'element-plus'; @@ -11,7 +11,7 @@ import router from '@/router'; import { isEmpty } from '@/utils'; import { useUserStore } from '@/store/modules/user'; -const { VITE_APP_BASE_API, VITE_APP_UPLOAD_API, VITE_APP_DICDATA_API } = import.meta.env; +const { VITE_APP_BASE_API, VITE_APP_UPLOAD_API } = import.meta.env; /** * 创建axios实例 diff --git a/sub-government-affairs-service/src/views/system/role/authUser.vue b/sub-government-affairs-service/src/views/system/role/authUser.vue new file mode 100644 index 0000000..08c6b98 --- /dev/null +++ b/sub-government-affairs-service/src/views/system/role/authUser.vue @@ -0,0 +1,266 @@ + + diff --git a/sub-government-affairs-service/src/views/system/role/index.vue b/sub-government-affairs-service/src/views/system/role/index.vue index d1c2f11..79c38b8 100644 --- a/sub-government-affairs-service/src/views/system/role/index.vue +++ b/sub-government-affairs-service/src/views/system/role/index.vue @@ -473,10 +473,10 @@ const rowScopeSave = () => { // 分配用户 const rowUser = (row) => { - // router.push({ - // path: '/sub-government-affairs-service/system-auth-user', - // query: { id: row.roleId }, - // }); + router.push({ + path: '/sub-government-affairs-service/system-auth-user', + query: { id: row.roleId }, + }); }; // 新增 diff --git a/sub-government-affairs-service/src/views/system/role/selectUser.vue b/sub-government-affairs-service/src/views/system/role/selectUser.vue new file mode 100644 index 0000000..4609d4e --- /dev/null +++ b/sub-government-affairs-service/src/views/system/role/selectUser.vue @@ -0,0 +1,227 @@ + + diff --git a/sub-government-screen-service/.env.production b/sub-government-screen-service/.env.production index 0c44983..61492c2 100644 --- a/sub-government-screen-service/.env.production +++ b/sub-government-screen-service/.env.production @@ -1,6 +1,6 @@ # 生产环境 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' VITE_APP_NAME = 'sub-government-screen-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-operation-service/.env.production b/sub-operation-service/.env.production index 91a8892..1ef59cf 100644 --- a/sub-operation-service/.env.production +++ b/sub-operation-service/.env.production @@ -1,6 +1,6 @@ # 生产环境 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' VITE_APP_NAME = 'sub-operation-service' # 接口 VITE_APP_BASE_API = '/apis'