diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 8c683defb..7f9ac89d1 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -9,7 +9,9 @@ import store from '@/store' import {Message} from 'element-ui' export const CancelToken = axios.CancelToken // import 'element-ui/lib/theme-chalk/index.css' -const _axios = axios.create() +const _axios = axios.create({ + baseURL: '/' +}) /** * @description: FormData @@ -63,7 +65,7 @@ _axios.interceptors.response.use( } }) function api () { - return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '' + return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '/api/' } export default { _axios, diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index cd7f837d3..b35116d0b 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -93,11 +93,11 @@ export default { path: '/standardForComments', menuId: '' }, - // { - // title: '海外标准法规', - // path: '/foreignStandardsAndRegulations', - // menuId: '6K8A2RZYRE' - // }, + { + title: '海外标准法规', + path: '/foreignStandardsAndRegulations', + menuId: '6K8A2RZYRE' + }, // { // title: '国内外政策', // path: '/foreignRegulationsDatabase', @@ -143,11 +143,11 @@ export default { path: '/localProductsOrProjectLibrary', menuId: 'PCZKM8TQJAH5UP5EAXTJ' }, - // { - // title: '未符合项跟踪', - // path: '/nonConfomity', - // menuId: 'HQSK8WWPDJG7R5F53LTK' - // }, + { + title: '未符合项跟踪', + path: '/nonConfomity', + menuId: 'HQSK8WWPDJG7R5F53LTK' + }, // { // title: '标准法规工作组', // path: '/workGroup', diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index cb12ad4c3..618604e72 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2250,7 +2250,7 @@ export default { type: 'warning', roundButton: false }).then(() => { - this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: itemid}, { + this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: itemid}, { _this: this, loading: 'delLoading' }, res => { @@ -2350,7 +2350,7 @@ export default { validateStandNumber (standinfo) { return new Promise((resolve, reject) => { let obj = JSON.parse(JSON.stringify(standinfo)) - this.$http.post('lawss/sarStandardsInfo/validateStandNumber', obj, { + this.$http.post('sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', obj, { _this: this }, res => { if (res.ok) { @@ -3314,7 +3314,7 @@ export default { */ queryDisplayLocation () { return new Promise((resolve, reject) => { - this.$http.get('lawssBase/utArea/getAreaList', { + this.$http.get('sarStandardsInfo/sar-standards-info/addarStandardsInfo', { sarType: this.sarType }, { _this: this diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index f4040b04f..59640481c 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -42,7 +42,7 @@ const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLO module.exports = { serverUrl: 'http://' + serverIP, // 服务器IP地址 - interfaceUrl: 'http://' + serverIP + ':' + interfacePORT, // 服务器端接口访问地址, + interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 diff --git a/vue.config.js b/vue.config.js index 84f1e541f..40b40d896 100644 --- a/vue.config.js +++ b/vue.config.js @@ -82,7 +82,7 @@ module.exports = { target: interfaceUrl, changeOrigin: true, pathRewrite: { - '^/api': '/' + '^/api': '' } }, '/onlyOffice': {