diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 6fae6a3..3b2ae66 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,12 +1,11 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! -// const baseURL = 'http://192.168.1.200:5910/' // 角色查询 export function getRoleList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/list`, method: 'get', params, @@ -14,16 +13,14 @@ } // 角色机构树列表 export function getRoleTreeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/tree`, method: 'get', }) } // 根据用户获取角色机构树列表 export function getRoleTreeListByUser(userId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByUserId`, method: 'get', params: { @@ -34,8 +31,7 @@ // 添加角色机构 export function addRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/add`, method: 'post', data, @@ -43,8 +39,7 @@ } // 修改角色机构 export function updateRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/update`, method: 'post', data, @@ -52,8 +47,7 @@ } // 删除角色机构 export function delRole(id: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/delete`, method: 'post', data: { @@ -64,8 +58,7 @@ // 功能授权 export function funcAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/role/funcAuthor', method: 'post', data: { @@ -76,8 +69,7 @@ } // 数据授权 export function dataAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/dataAuthor`, method: 'post', data: { @@ -89,8 +81,7 @@ // 角色类型列表 export function getDataScopeTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/dataScopeType`, method: 'get', }) diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 6fae6a3..3b2ae66 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,12 +1,11 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! -// const baseURL = 'http://192.168.1.200:5910/' // 角色查询 export function getRoleList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/list`, method: 'get', params, @@ -14,16 +13,14 @@ } // 角色机构树列表 export function getRoleTreeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/tree`, method: 'get', }) } // 根据用户获取角色机构树列表 export function getRoleTreeListByUser(userId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByUserId`, method: 'get', params: { @@ -34,8 +31,7 @@ // 添加角色机构 export function addRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/add`, method: 'post', data, @@ -43,8 +39,7 @@ } // 修改角色机构 export function updateRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/update`, method: 'post', data, @@ -52,8 +47,7 @@ } // 删除角色机构 export function delRole(id: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/delete`, method: 'post', data: { @@ -64,8 +58,7 @@ // 功能授权 export function funcAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/role/funcAuthor', method: 'post', data: { @@ -76,8 +69,7 @@ } // 数据授权 export function dataAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/dataAuthor`, method: 'post', data: { @@ -89,8 +81,7 @@ // 角色类型列表 export function getDataScopeTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/dataScopeType`, method: 'get', }) diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 4268a07..f04f197 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -11,8 +11,7 @@ } // 用户列表 export function getUserList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/list`, method: 'get', params, @@ -22,7 +21,6 @@ // 添加用户 export function addUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/add`, // url: 'sysytem/mgr/add', method: 'post', @@ -33,7 +31,6 @@ // 修改用户 export function updateUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/update`, // url: 'system/mgr/update', method: 'post', @@ -43,8 +40,7 @@ } // 删除用户 export function delUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/delete`, method: 'post', data, @@ -53,8 +49,7 @@ // 冻结用户 export function freezeUserApi(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/freeze`, method: 'post', data, @@ -62,8 +57,7 @@ } // 冻结用户 export function unfreezeUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/unfreeze`, method: 'post', data, @@ -72,8 +66,7 @@ // 重置用户密码 export function resetPwdApi(data: object) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/reset', method: 'post', data, @@ -82,8 +75,7 @@ // 分配角色 export function roleAssign(userId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/roleAssign', method: 'post', data: { diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 6fae6a3..3b2ae66 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,12 +1,11 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! -// const baseURL = 'http://192.168.1.200:5910/' // 角色查询 export function getRoleList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/list`, method: 'get', params, @@ -14,16 +13,14 @@ } // 角色机构树列表 export function getRoleTreeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/tree`, method: 'get', }) } // 根据用户获取角色机构树列表 export function getRoleTreeListByUser(userId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByUserId`, method: 'get', params: { @@ -34,8 +31,7 @@ // 添加角色机构 export function addRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/add`, method: 'post', data, @@ -43,8 +39,7 @@ } // 修改角色机构 export function updateRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/update`, method: 'post', data, @@ -52,8 +47,7 @@ } // 删除角色机构 export function delRole(id: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/delete`, method: 'post', data: { @@ -64,8 +58,7 @@ // 功能授权 export function funcAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/role/funcAuthor', method: 'post', data: { @@ -76,8 +69,7 @@ } // 数据授权 export function dataAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/dataAuthor`, method: 'post', data: { @@ -89,8 +81,7 @@ // 角色类型列表 export function getDataScopeTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/dataScopeType`, method: 'get', }) diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 4268a07..f04f197 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -11,8 +11,7 @@ } // 用户列表 export function getUserList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/list`, method: 'get', params, @@ -22,7 +21,6 @@ // 添加用户 export function addUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/add`, // url: 'sysytem/mgr/add', method: 'post', @@ -33,7 +31,6 @@ // 修改用户 export function updateUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/update`, // url: 'system/mgr/update', method: 'post', @@ -43,8 +40,7 @@ } // 删除用户 export function delUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/delete`, method: 'post', data, @@ -53,8 +49,7 @@ // 冻结用户 export function freezeUserApi(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/freeze`, method: 'post', data, @@ -62,8 +57,7 @@ } // 冻结用户 export function unfreezeUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/unfreeze`, method: 'post', data, @@ -72,8 +66,7 @@ // 重置用户密码 export function resetPwdApi(data: object) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/reset', method: 'post', data, @@ -82,8 +75,7 @@ // 分配角色 export function roleAssign(userId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/roleAssign', method: 'post', data: { diff --git a/src/main.ts b/src/main.ts index abdb320..c9ce15a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -44,6 +44,7 @@ app.config.globalProperties.$pathDict = result.data.pathDict window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) + window.localStorage.setItem('baseUrlBusiness', result.data.baseUrlBusiness) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') }).catch((error) => { diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 6fae6a3..3b2ae66 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,12 +1,11 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! -// const baseURL = 'http://192.168.1.200:5910/' // 角色查询 export function getRoleList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/list`, method: 'get', params, @@ -14,16 +13,14 @@ } // 角色机构树列表 export function getRoleTreeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/tree`, method: 'get', }) } // 根据用户获取角色机构树列表 export function getRoleTreeListByUser(userId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByUserId`, method: 'get', params: { @@ -34,8 +31,7 @@ // 添加角色机构 export function addRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/add`, method: 'post', data, @@ -43,8 +39,7 @@ } // 修改角色机构 export function updateRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/update`, method: 'post', data, @@ -52,8 +47,7 @@ } // 删除角色机构 export function delRole(id: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/delete`, method: 'post', data: { @@ -64,8 +58,7 @@ // 功能授权 export function funcAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/role/funcAuthor', method: 'post', data: { @@ -76,8 +69,7 @@ } // 数据授权 export function dataAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/dataAuthor`, method: 'post', data: { @@ -89,8 +81,7 @@ // 角色类型列表 export function getDataScopeTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/dataScopeType`, method: 'get', }) diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 4268a07..f04f197 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -11,8 +11,7 @@ } // 用户列表 export function getUserList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/list`, method: 'get', params, @@ -22,7 +21,6 @@ // 添加用户 export function addUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/add`, // url: 'sysytem/mgr/add', method: 'post', @@ -33,7 +31,6 @@ // 修改用户 export function updateUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/update`, // url: 'system/mgr/update', method: 'post', @@ -43,8 +40,7 @@ } // 删除用户 export function delUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/delete`, method: 'post', data, @@ -53,8 +49,7 @@ // 冻结用户 export function freezeUserApi(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/freeze`, method: 'post', data, @@ -62,8 +57,7 @@ } // 冻结用户 export function unfreezeUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/unfreeze`, method: 'post', data, @@ -72,8 +66,7 @@ // 重置用户密码 export function resetPwdApi(data: object) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/reset', method: 'post', data, @@ -82,8 +75,7 @@ // 分配角色 export function roleAssign(userId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/roleAssign', method: 'post', data: { diff --git a/src/main.ts b/src/main.ts index abdb320..c9ce15a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -44,6 +44,7 @@ app.config.globalProperties.$pathDict = result.data.pathDict window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) + window.localStorage.setItem('baseUrlBusiness', result.data.baseUrlBusiness) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') }).catch((error) => { diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9f8c8ff..a2a96fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -353,30 +353,30 @@ auth: '/tested/device/model', }, children: [ - { - path: '/dmodel', - name: 'DeviceModelPage', - component: () => import('@/views/tested/device/model/index.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, - { - path: '/dmodel/:type', - name: 'ModelEdit', - component: () => import('@/views/tested/device/model/components/edit.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, + // { + // path: '/dmodel', + // name: 'DeviceModelPage', + // component: () => import('@/views/tested/device/model/index.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, + // { + // path: '/dmodel/:type', + // name: 'ModelEdit', + // component: () => import('@/views/tested/device/model/components/edit.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, ], }, { diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 6fae6a3..3b2ae66 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,12 +1,11 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! -// const baseURL = 'http://192.168.1.200:5910/' // 角色查询 export function getRoleList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/list`, method: 'get', params, @@ -14,16 +13,14 @@ } // 角色机构树列表 export function getRoleTreeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/tree`, method: 'get', }) } // 根据用户获取角色机构树列表 export function getRoleTreeListByUser(userId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByUserId`, method: 'get', params: { @@ -34,8 +31,7 @@ // 添加角色机构 export function addRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/add`, method: 'post', data, @@ -43,8 +39,7 @@ } // 修改角色机构 export function updateRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/update`, method: 'post', data, @@ -52,8 +47,7 @@ } // 删除角色机构 export function delRole(id: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/delete`, method: 'post', data: { @@ -64,8 +58,7 @@ // 功能授权 export function funcAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/role/funcAuthor', method: 'post', data: { @@ -76,8 +69,7 @@ } // 数据授权 export function dataAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/dataAuthor`, method: 'post', data: { @@ -89,8 +81,7 @@ // 角色类型列表 export function getDataScopeTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/dataScopeType`, method: 'get', }) diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 4268a07..f04f197 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -11,8 +11,7 @@ } // 用户列表 export function getUserList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/list`, method: 'get', params, @@ -22,7 +21,6 @@ // 添加用户 export function addUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/add`, // url: 'sysytem/mgr/add', method: 'post', @@ -33,7 +31,6 @@ // 修改用户 export function updateUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/update`, // url: 'system/mgr/update', method: 'post', @@ -43,8 +40,7 @@ } // 删除用户 export function delUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/delete`, method: 'post', data, @@ -53,8 +49,7 @@ // 冻结用户 export function freezeUserApi(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/freeze`, method: 'post', data, @@ -62,8 +57,7 @@ } // 冻结用户 export function unfreezeUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/unfreeze`, method: 'post', data, @@ -72,8 +66,7 @@ // 重置用户密码 export function resetPwdApi(data: object) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/reset', method: 'post', data, @@ -82,8 +75,7 @@ // 分配角色 export function roleAssign(userId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/roleAssign', method: 'post', data: { diff --git a/src/main.ts b/src/main.ts index abdb320..c9ce15a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -44,6 +44,7 @@ app.config.globalProperties.$pathDict = result.data.pathDict window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) + window.localStorage.setItem('baseUrlBusiness', result.data.baseUrlBusiness) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') }).catch((error) => { diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9f8c8ff..a2a96fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -353,30 +353,30 @@ auth: '/tested/device/model', }, children: [ - { - path: '/dmodel', - name: 'DeviceModelPage', - component: () => import('@/views/tested/device/model/index.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, - { - path: '/dmodel/:type', - name: 'ModelEdit', - component: () => import('@/views/tested/device/model/components/edit.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, + // { + // path: '/dmodel', + // name: 'DeviceModelPage', + // component: () => import('@/views/tested/device/model/index.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, + // { + // path: '/dmodel/:type', + // name: 'ModelEdit', + // component: () => import('@/views/tested/device/model/components/edit.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, ], }, { diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue index ffcd26d..2c2f7cf 100644 --- a/src/views/tested/MeasurementBusiness/review/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue @@ -6,7 +6,7 @@ import { printPage } from '@/api/eqpt/MeasurementBusiness/review' import { exportFile, printContent } from '@/utils/exportUtils' import { printPdf } from '@/utils/printUtils' -import { getObjectURL, getFiles } from '@/utils/download' +import { getFiles, getObjectURL } from '@/utils/download' const $route = useRoute() const $router = useRouter() const ruleFormRef = ref() // from组件 diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 6fae6a3..3b2ae66 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,12 +1,11 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! -// const baseURL = 'http://192.168.1.200:5910/' // 角色查询 export function getRoleList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/list`, method: 'get', params, @@ -14,16 +13,14 @@ } // 角色机构树列表 export function getRoleTreeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/tree`, method: 'get', }) } // 根据用户获取角色机构树列表 export function getRoleTreeListByUser(userId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByUserId`, method: 'get', params: { @@ -34,8 +31,7 @@ // 添加角色机构 export function addRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/add`, method: 'post', data, @@ -43,8 +39,7 @@ } // 修改角色机构 export function updateRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/update`, method: 'post', data, @@ -52,8 +47,7 @@ } // 删除角色机构 export function delRole(id: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/delete`, method: 'post', data: { @@ -64,8 +58,7 @@ // 功能授权 export function funcAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/role/funcAuthor', method: 'post', data: { @@ -76,8 +69,7 @@ } // 数据授权 export function dataAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/dataAuthor`, method: 'post', data: { @@ -89,8 +81,7 @@ // 角色类型列表 export function getDataScopeTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/dataScopeType`, method: 'get', }) diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 4268a07..f04f197 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -11,8 +11,7 @@ } // 用户列表 export function getUserList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/list`, method: 'get', params, @@ -22,7 +21,6 @@ // 添加用户 export function addUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/add`, // url: 'sysytem/mgr/add', method: 'post', @@ -33,7 +31,6 @@ // 修改用户 export function updateUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/update`, // url: 'system/mgr/update', method: 'post', @@ -43,8 +40,7 @@ } // 删除用户 export function delUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/delete`, method: 'post', data, @@ -53,8 +49,7 @@ // 冻结用户 export function freezeUserApi(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/freeze`, method: 'post', data, @@ -62,8 +57,7 @@ } // 冻结用户 export function unfreezeUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/unfreeze`, method: 'post', data, @@ -72,8 +66,7 @@ // 重置用户密码 export function resetPwdApi(data: object) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/reset', method: 'post', data, @@ -82,8 +75,7 @@ // 分配角色 export function roleAssign(userId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/roleAssign', method: 'post', data: { diff --git a/src/main.ts b/src/main.ts index abdb320..c9ce15a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -44,6 +44,7 @@ app.config.globalProperties.$pathDict = result.data.pathDict window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) + window.localStorage.setItem('baseUrlBusiness', result.data.baseUrlBusiness) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') }).catch((error) => { diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9f8c8ff..a2a96fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -353,30 +353,30 @@ auth: '/tested/device/model', }, children: [ - { - path: '/dmodel', - name: 'DeviceModelPage', - component: () => import('@/views/tested/device/model/index.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, - { - path: '/dmodel/:type', - name: 'ModelEdit', - component: () => import('@/views/tested/device/model/components/edit.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, + // { + // path: '/dmodel', + // name: 'DeviceModelPage', + // component: () => import('@/views/tested/device/model/index.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, + // { + // path: '/dmodel/:type', + // name: 'ModelEdit', + // component: () => import('@/views/tested/device/model/components/edit.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, ], }, { diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue index ffcd26d..2c2f7cf 100644 --- a/src/views/tested/MeasurementBusiness/review/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue @@ -6,7 +6,7 @@ import { printPage } from '@/api/eqpt/MeasurementBusiness/review' import { exportFile, printContent } from '@/utils/exportUtils' import { printPdf } from '@/utils/printUtils' -import { getObjectURL, getFiles } from '@/utils/download' +import { getFiles, getObjectURL } from '@/utils/download' const $route = useRoute() const $router = useRouter() const ruleFormRef = ref() // from组件 diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue index d3779aa..27133e5 100644 --- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue +++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue @@ -2,7 +2,7 @@ diff --git a/public/config/config.json b/public/config/config.json index a94aaa7..f5f204f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611", + "baseUrl": "http://192.168.8.100:5909", + "baseUrlBusiness": "http://192.168.8.100:5910", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index 0130a20..bef1a1a 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -1,7 +1,7 @@ /** * 首页接口 */ -import QS from 'qs' +// import QS from 'qs' import request from '@/api/index' // 检定统计 diff --git a/src/api/index.ts b/src/api/index.ts index 951bff6..98a3fa6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' diff --git a/src/api/request.ts b/src/api/request.ts index d622539..43bc556 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,5 +1,5 @@ import axios from 'axios' -import qs from 'qs' +// import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' import router from '@/router/index' import useUserStore from '@/store/modules/user' @@ -11,9 +11,8 @@ } // 以下地址发生错误直接跳转至登录页 const toLoginPath = ['/sys/user/permission', '/sys/user/info'] - // 跳转到登录页面 -const toLogin = () => { +const toLogin = () => { // 受检的登陆调业务得登陆接口 useUserStore().logout() router.push({ path: '/login', @@ -24,8 +23,8 @@ } const request = axios.create({ - // baseURL: window.localStorage.getItem('baseURL')!, - baseURL: import.meta.env.VITE_METER_API_BASEURL, + baseURL: window.localStorage.getItem('baseUrlBusiness')!, + // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 804eea2..64fd8c5 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,12 +1,12 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! // const baseURL = 'http://192.168.1.200:5910/' // 组织查询 export function getDeptList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/list`, method: 'get', params, @@ -14,8 +14,7 @@ } // 组织机构树列表 export function getDeptTreeList(params?: { deptType: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/tree`, method: 'get', params, @@ -24,8 +23,7 @@ // 组织机构树列表 export function getDeptTreeListByPid(pid: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/dept/listByPid`, method: 'get', params: { @@ -35,8 +33,7 @@ } // 根据角色获取组织机构树列表 export function getDeptTreeByRole(roleId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByRoleId`, method: 'get', params: { @@ -47,8 +44,7 @@ // 添加组织机构 export function addDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/add', method: 'post', data, @@ -56,8 +52,7 @@ } // 修改组织机构 export function updateDept(data: object) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/update', method: 'post', data, @@ -65,8 +60,7 @@ } // 删除组织机构 export function delDept(id: string) { - return request({ - // baseURL, + return request1({ url: '/sys/dept/delete', method: 'post', data: { @@ -77,8 +71,7 @@ // 资源类型列表 export function getDeptTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/deptType`, method: 'get', }) diff --git a/src/api/system/login.ts b/src/api/system/login.ts index f5939f4..054d70d 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -25,18 +25,18 @@ // 获取用户信息 export function getInfo() { - return request.get(`${prefix}user/info`) + return request1.get(`${prefix}user/info`) } // 获取用户权限(菜单、按钮) export function getUserMenus(params: { resourceType: string; parentCode: string }) { - return request.get(`${prefix}user/permission`, { params }) + return request1.get(`${prefix}user/permission`, { params }) } // 登出 export function logout() { window.localStorage.clear() // 清除loacalStorage所有数据 - return request.get(`${prefix}user/logout`) + return request1.get(`${prefix}user/logout`) } // 获取系统基础配置:公钥,验证码是否开启 diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 6fae6a3..3b2ae66 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,12 +1,11 @@ -import request from '../index' +// import request from '../index' +import request1 from '../request' const prefix = 'sys' // const baseURL = window.localStorage.getItem('baseUrlAccount')! -// const baseURL = 'http://192.168.1.200:5910/' // 角色查询 export function getRoleList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/list`, method: 'get', params, @@ -14,16 +13,14 @@ } // 角色机构树列表 export function getRoleTreeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/tree`, method: 'get', }) } // 根据用户获取角色机构树列表 export function getRoleTreeListByUser(userId: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/treeByUserId`, method: 'get', params: { @@ -34,8 +31,7 @@ // 添加角色机构 export function addRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/add`, method: 'post', data, @@ -43,8 +39,7 @@ } // 修改角色机构 export function updateRole(data: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/update`, method: 'post', data, @@ -52,8 +47,7 @@ } // 删除角色机构 export function delRole(id: string) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/delete`, method: 'post', data: { @@ -64,8 +58,7 @@ // 功能授权 export function funcAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/role/funcAuthor', method: 'post', data: { @@ -76,8 +69,7 @@ } // 数据授权 export function dataAuthor(roleId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: `${prefix}/role/dataAuthor`, method: 'post', data: { @@ -89,8 +81,7 @@ // 角色类型列表 export function getDataScopeTypeList() { - return request({ - // baseURL, + return request1({ url: `${prefix}/dict/code/dataScopeType`, method: 'get', }) diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 4268a07..f04f197 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -11,8 +11,7 @@ } // 用户列表 export function getUserList(params: object) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/list`, method: 'get', params, @@ -22,7 +21,6 @@ // 添加用户 export function addUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/add`, // url: 'sysytem/mgr/add', method: 'post', @@ -33,7 +31,6 @@ // 修改用户 export function updateUser(data: object) { return request1({ - // baseURL, url: `${prefix}mgr/update`, // url: 'system/mgr/update', method: 'post', @@ -43,8 +40,7 @@ } // 删除用户 export function delUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/delete`, method: 'post', data, @@ -53,8 +49,7 @@ // 冻结用户 export function freezeUserApi(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/freeze`, method: 'post', data, @@ -62,8 +57,7 @@ } // 冻结用户 export function unfreezeUser(data: { id: string }) { - return request({ - // baseURL, + return request1({ url: `${prefix}mgr/unfreeze`, method: 'post', data, @@ -72,8 +66,7 @@ // 重置用户密码 export function resetPwdApi(data: object) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/reset', method: 'post', data, @@ -82,8 +75,7 @@ // 分配角色 export function roleAssign(userId: string, ids: string[]) { - return request({ - // baseURL, + return request1({ url: 'sys/mgr/roleAssign', method: 'post', data: { diff --git a/src/main.ts b/src/main.ts index abdb320..c9ce15a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -44,6 +44,7 @@ app.config.globalProperties.$pathDict = result.data.pathDict window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) + window.localStorage.setItem('baseUrlBusiness', result.data.baseUrlBusiness) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') }).catch((error) => { diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9f8c8ff..a2a96fb 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -353,30 +353,30 @@ auth: '/tested/device/model', }, children: [ - { - path: '/dmodel', - name: 'DeviceModelPage', - component: () => import('@/views/tested/device/model/index.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, - { - path: '/dmodel/:type', - name: 'ModelEdit', - component: () => import('@/views/tested/device/model/components/edit.vue'), - meta: { - title: '设备规格型号管理', - auth: '/tested/device/model', - sidebar: false, - breadcrumb: false, - activeMenu: '/modellist', - }, - }, + // { + // path: '/dmodel', + // name: 'DeviceModelPage', + // component: () => import('@/views/tested/device/model/index.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, + // { + // path: '/dmodel/:type', + // name: 'ModelEdit', + // component: () => import('@/views/tested/device/model/components/edit.vue'), + // meta: { + // title: '设备规格型号管理', + // auth: '/tested/device/model', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/modellist', + // }, + // }, ], }, { diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue index ffcd26d..2c2f7cf 100644 --- a/src/views/tested/MeasurementBusiness/review/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue @@ -6,7 +6,7 @@ import { printPage } from '@/api/eqpt/MeasurementBusiness/review' import { exportFile, printContent } from '@/utils/exportUtils' import { printPdf } from '@/utils/printUtils' -import { getObjectURL, getFiles } from '@/utils/download' +import { getFiles, getObjectURL } from '@/utils/download' const $route = useRoute() const $router = useRouter() const ruleFormRef = ref() // from组件 diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue index d3779aa..27133e5 100644 --- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue +++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue @@ -2,7 +2,7 @@ diff --git a/vite.config.ts b/vite.config.ts index 6826527..17339bd 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -39,6 +39,11 @@ build: { outDir: mode === 'production' ? 'dist' : `dist-${mode}`, sourcemap: env.VITE_BUILD_SOURCEMAP === 'true', + rollupOptions: { + external: [ + 'pdfjs-dist', + ], + }, }, define: { __SYSTEM_INFO__: JSON.stringify({