From 0b7920498e818d01634437e4cace54fccebf5e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 4 Jun 2021 09:14:03 +0800 Subject: [PATCH 1/4] commit --- src/pages/home1/components/searchGroup/index.vue | 2 +- src/pages/localTool/standardWarning.vue | 13 +++++++++++-- src/pages/login/index.vue | 4 ++-- .../standardForComments/pags/categoryDetails.vue | 8 ++++++-- .../pags/consultationDetails.vue | 1 + src/sysConfig/index.js | 9 +++++---- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/pages/home1/components/searchGroup/index.vue b/src/pages/home1/components/searchGroup/index.vue index 70a7e179a..ee628b2be 100644 --- a/src/pages/home1/components/searchGroup/index.vue +++ b/src/pages/home1/components/searchGroup/index.vue @@ -104,7 +104,7 @@ export default { height: 50px; border: 0; border-radius: 0px; - background-color: #76b3f1; + background-color: #5ea9f6; } } diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 9047af2f2..67f5f71d9 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -16,8 +16,17 @@ + placeholder="根据适用车型查找"> + + + + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 53de8eff5..33f6fd33f 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -67,8 +67,8 @@ export default { loginUser (userName, PWD) { this.loading = true // 用户名密码加密 - userName = this.$base64(userName) - PWD = this.$base64(PWD) + // userName = this.$base64(userName) + // PWD = this.$base64(PWD) this.$http.post('login', { username: userName, diff --git a/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue index de3ad4474..d6b3b2672 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue @@ -5,7 +5,7 @@
-
{{ personShareEO.oldStandName }}
+
{{opinionList.standardName }}
@@ -230,7 +230,7 @@ export default { line-height: 35px; .transition-box-label{ display: inline-block; - width: 80px; + width: 100px; vertical-align: top; } .transition-box-span{ @@ -272,6 +272,10 @@ export default { } } } + .effect { + margin-left: 10px; + margin-bottom: 10px; + } .container { //height: calc(~'100% - 52px - 55px - 50px'); flex: auto; diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index b3dd00854..95b38a788 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -299,6 +299,7 @@ export default { } .effect { margin-left: 10px; + margin-bottom: 10px; } .container { height: calc(~'100% - 52px - 55px - 50px'); diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index aa1e74cb8..52e126b69 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -3,11 +3,12 @@ * @author: chenxiaoxi * @date: 2018-09-04 17:47:46 */ +// 后台地址 +const devIp = '192.168.10.186' +const devInterfacePORT = '9999' // 服务器地址 -// const devIp = '192.168.10.211' -// const devInterfacePORT = '8888' -const devIp = '39.98.140.126' -const devInterfacePORT = '10005' +// const devIp = '39.98.140.126' +// const devInterfacePORT = '10005' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' From a96acfaa1c7209ecbacb0292152fd94d8ed56c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 4 Jun 2021 10:54:45 +0800 Subject: [PATCH 2/4] commit --- src/api/index.js | 2 +- src/common/axios/index.js | 6 ++---- src/pages/details/otherStandardDetails/index.vue | 1 - src/pages/login/index.vue | 4 ++-- .../domesticStandardsAndRegulations/index.vue | 6 ++++-- src/sysConfig/index.js | 4 ++-- vue.config.js | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 2548daf6f..b55273416 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -36,4 +36,4 @@ export function getRoleAndUserByOrgIdPage (params) { method: 'get', params }) -} \ No newline at end of file +} diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 7f9ac89d1..8c683defb 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -9,9 +9,7 @@ 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({ - baseURL: '/' -}) +const _axios = axios.create() /** * @description: FormData @@ -65,7 +63,7 @@ _axios.interceptors.response.use( } }) function api () { - return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '/api/' + return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '' } export default { _axios, diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 504900654..a7714f971 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -2826,7 +2826,6 @@ export default { font-weight: bold; color: #e88218; margin-top: -80px; - background: #E5E5E5; } /deep/.details-content{ /*padding: 0 67px;*/ diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 33f6fd33f..53de8eff5 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -67,8 +67,8 @@ export default { loginUser (userName, PWD) { this.loading = true // 用户名密码加密 - // userName = this.$base64(userName) - // PWD = this.$base64(PWD) + userName = this.$base64(userName) + PWD = this.$base64(PWD) this.$http.post('login', { username: userName, diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f408417b..cb12ad4c3 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2493,7 +2493,8 @@ export default { formData.standType = 'INLAND' this.SarExportSearchEo = formData this.loading = true - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', formData, { + console.log(2496) + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { _this: this, loading: 'loading' }, res => { this.isAdvancedSearch = false @@ -3612,7 +3613,8 @@ export default { }, async mounted () { // 进入页面后查询树形结构目录 - await this.selectMenu() + // await this.selectMenu() + this.treeReload = true // 从数据库中查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 52e126b69..f4040b04f 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -4,7 +4,7 @@ * @date: 2018-09-04 17:47:46 */ // 后台地址 -const devIp = '192.168.10.186' +const devIp = '192.168.10.145' const devInterfacePORT = '9999' // 服务器地址 // const devIp = '39.98.140.126' @@ -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 + '/api/', // 服务器端接口访问地址, + interfaceUrl: 'http://' + serverIP + ':' + interfacePORT, // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 diff --git a/vue.config.js b/vue.config.js index 40b40d896..84f1e541f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -82,7 +82,7 @@ module.exports = { target: interfaceUrl, changeOrigin: true, pathRewrite: { - '^/api': '' + '^/api': '/' } }, '/onlyOffice': { From 9cc1b166042148135a9cd97fedc1115ca4513ede Mon Sep 17 00:00:00 2001 From: chenxiaoxi Date: Fri, 4 Jun 2021 10:56:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 193 +++++++++++++++++++++++++--------------------- 1 file changed, 105 insertions(+), 88 deletions(-) diff --git a/package-lock.json b/package-lock.json index dbc73fa45..5c741682c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3619,6 +3619,23 @@ "upath": "^1.1.1" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4564,6 +4581,94 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.2.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz", + "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true, + "optional": true + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "optional": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -13515,94 +13620,6 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.1.2", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz", - "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", From af2a58433d00d146fd459293005a49b1e979d8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 4 Jun 2021 15:26:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=92=8C=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios/index.js | 6 ++++-- src/components/navMenu/index.vue | 20 +++++++++---------- .../domesticStandardsAndRegulations/index.vue | 6 +++--- src/sysConfig/index.js | 2 +- vue.config.js | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) 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': {