diff --git a/public/config/config.json b/public/config/config.json index f5f204f..bed5355 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909", - "baseUrlBusiness": "http://192.168.8.100:5910", + "baseUrl": "http://111.198.10.15:21611", + "baseUrlBusiness": "http://111.198.10.15:21606", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", @@ -20,6 +20,5 @@ "设备到期":"/info/detail", "计量计划":"/plan/detail", "合同通知":"/breviewpage/detail" - } } diff --git a/public/config/config.json b/public/config/config.json index f5f204f..bed5355 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909", - "baseUrlBusiness": "http://192.168.8.100:5910", + "baseUrl": "http://111.198.10.15:21611", + "baseUrlBusiness": "http://111.198.10.15:21606", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", @@ -20,6 +20,5 @@ "设备到期":"/info/detail", "计量计划":"/plan/detail", "合同通知":"/breviewpage/detail" - } } diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts index 3b3d55c..efbffcf 100644 --- a/src/api/system/resource.ts +++ b/src/api/system/resource.ts @@ -1,9 +1,10 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys' // 资源查询 export function getResourceList(params: object) { - return request({ + return request1({ url: `${prefix}/resource/list`, method: 'get', params, @@ -11,7 +12,7 @@ } // 资源查询 export function getResourceListByRole(roleId: string) { - return request({ + return request1({ url: `${prefix}/resource/treeListByRoleId`, method: 'get', params: { @@ -21,7 +22,7 @@ } // 资源树列表 export function getResourceTreeList() { - return request({ + return request1({ url: `${prefix}/resource/tree`, method: 'get', }) @@ -29,7 +30,7 @@ // 资源类型列表 export function getResourceTypeList() { - return request({ + return request1({ url: `${prefix}/dict/code/resourceType`, method: 'get', }) @@ -37,7 +38,7 @@ // 添加资源 export function addResource(data: object) { - return request({ + return request1({ url: `${prefix}/resource/add`, method: 'post', data, @@ -45,7 +46,7 @@ } // 修改资源 export function updateResource(data: object) { - return request({ + return request1({ url: `${prefix}/resource/update`, method: 'post', data, @@ -53,7 +54,7 @@ } // 删除资源 export function delResource(id: string) { - return request({ + return request1({ url: `${prefix}/resource/delete`, method: 'post', data: { diff --git a/public/config/config.json b/public/config/config.json index f5f204f..bed5355 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909", - "baseUrlBusiness": "http://192.168.8.100:5910", + "baseUrl": "http://111.198.10.15:21611", + "baseUrlBusiness": "http://111.198.10.15:21606", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", @@ -20,6 +20,5 @@ "设备到期":"/info/detail", "计量计划":"/plan/detail", "合同通知":"/breviewpage/detail" - } } diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts index 3b3d55c..efbffcf 100644 --- a/src/api/system/resource.ts +++ b/src/api/system/resource.ts @@ -1,9 +1,10 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys' // 资源查询 export function getResourceList(params: object) { - return request({ + return request1({ url: `${prefix}/resource/list`, method: 'get', params, @@ -11,7 +12,7 @@ } // 资源查询 export function getResourceListByRole(roleId: string) { - return request({ + return request1({ url: `${prefix}/resource/treeListByRoleId`, method: 'get', params: { @@ -21,7 +22,7 @@ } // 资源树列表 export function getResourceTreeList() { - return request({ + return request1({ url: `${prefix}/resource/tree`, method: 'get', }) @@ -29,7 +30,7 @@ // 资源类型列表 export function getResourceTypeList() { - return request({ + return request1({ url: `${prefix}/dict/code/resourceType`, method: 'get', }) @@ -37,7 +38,7 @@ // 添加资源 export function addResource(data: object) { - return request({ + return request1({ url: `${prefix}/resource/add`, method: 'post', data, @@ -45,7 +46,7 @@ } // 修改资源 export function updateResource(data: object) { - return request({ + return request1({ url: `${prefix}/resource/update`, method: 'post', data, @@ -53,7 +54,7 @@ } // 删除资源 export function delResource(id: string) { - return request({ + return request1({ url: `${prefix}/resource/delete`, method: 'post', data: { diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue index c88bb78..d1ac53c 100644 --- a/src/views/dashboard.vue +++ b/src/views/dashboard.vue @@ -41,7 +41,6 @@ const params = `?token=${token}` console.log(system.url + params) window.open(system.url + params) - // window.open(`http://127.0.0.1:9526${params}`) } else { localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code })) diff --git a/public/config/config.json b/public/config/config.json index f5f204f..bed5355 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909", - "baseUrlBusiness": "http://192.168.8.100:5910", + "baseUrl": "http://111.198.10.15:21611", + "baseUrlBusiness": "http://111.198.10.15:21606", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", @@ -20,6 +20,5 @@ "设备到期":"/info/detail", "计量计划":"/plan/detail", "合同通知":"/breviewpage/detail" - } } diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts index 3b3d55c..efbffcf 100644 --- a/src/api/system/resource.ts +++ b/src/api/system/resource.ts @@ -1,9 +1,10 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys' // 资源查询 export function getResourceList(params: object) { - return request({ + return request1({ url: `${prefix}/resource/list`, method: 'get', params, @@ -11,7 +12,7 @@ } // 资源查询 export function getResourceListByRole(roleId: string) { - return request({ + return request1({ url: `${prefix}/resource/treeListByRoleId`, method: 'get', params: { @@ -21,7 +22,7 @@ } // 资源树列表 export function getResourceTreeList() { - return request({ + return request1({ url: `${prefix}/resource/tree`, method: 'get', }) @@ -29,7 +30,7 @@ // 资源类型列表 export function getResourceTypeList() { - return request({ + return request1({ url: `${prefix}/dict/code/resourceType`, method: 'get', }) @@ -37,7 +38,7 @@ // 添加资源 export function addResource(data: object) { - return request({ + return request1({ url: `${prefix}/resource/add`, method: 'post', data, @@ -45,7 +46,7 @@ } // 修改资源 export function updateResource(data: object) { - return request({ + return request1({ url: `${prefix}/resource/update`, method: 'post', data, @@ -53,7 +54,7 @@ } // 删除资源 export function delResource(id: string) { - return request({ + return request1({ url: `${prefix}/resource/delete`, method: 'post', data: { diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue index c88bb78..d1ac53c 100644 --- a/src/views/dashboard.vue +++ b/src/views/dashboard.vue @@ -41,7 +41,6 @@ const params = `?token=${token}` console.log(system.url + params) window.open(system.url + params) - // window.open(`http://127.0.0.1:9526${params}`) } else { localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code })) diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue index 36f291b..28af38d 100644 --- a/src/views/tested/dashboard/components/tableList.vue +++ b/src/views/tested/dashboard/components/tableList.vue @@ -54,7 +54,7 @@ - +