From c9bacd743635fbca7a64f1d27a5237ebcb352810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Jun 2021 09:11:07 +0800 Subject: [PATCH 1/3] commit --- src/pages/home1/components/solicitopinions/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue index 65245e048..2da7e6647 100644 --- a/src/pages/home1/components/solicitopinions/index.vue +++ b/src/pages/home1/components/solicitopinions/index.vue @@ -3,7 +3,7 @@
@@ -37,7 +37,6 @@ export default { this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, { _this: this }, res => { - console.log('41',res) this.domesticDynamics = res.data.records }, e => { From 8978911b41d73468c7428cf7ec1fb91ac106bedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Jun 2021 14:22:04 +0800 Subject: [PATCH 2/3] commit --- .../domesticStandardsAndRegulations/index.vue | 4 ++-- .../foreignStandardsAndRegulations/index.vue | 12 ++++++------ src/sysConfig/index.js | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 4a3275424..67801d0cf 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2042,7 +2042,7 @@ export default { menuId: treeNode.id, idlist: this.selectedList.length ? this.selectedList : dragId } - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this }, res => { if (res.ok) { @@ -3172,7 +3172,7 @@ export default { }) } else { search.idlist = this.selectConfigStand - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this, loading: 'isSubmit' }, res => { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index c40f1b57e..443894147 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1979,7 +1979,7 @@ export default { menuId: treeNode.id, idlist: this.selectedList.length ? this.selectedList : dragId } - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this }, res => { if (res.ok) { @@ -2226,7 +2226,7 @@ export default { } else { this.importModalshowflag = true this.showUploadlist = true - this.importExcelUrl = '/api/lawss/sarStandardsInfo/importZipStandardsInfo?standType=FOREIGN&menuId=' + menuId + this.importExcelUrl = '/api/sarStandardsInfo/sar-standards-info/importZipStandardsInfo?standType=FOREIGN&menuId=' + menuId } } else { this.importModalshowflag = true @@ -2475,7 +2475,7 @@ export default { this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.sarConfigStandSearch, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, loading: 'loading' }, res => { @@ -2654,7 +2654,7 @@ export default { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) // } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceStandNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceStandNumForm, { _this: this // loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -2843,7 +2843,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -3090,7 +3090,7 @@ export default { }) } else { search.idlist = this.selectConfigStand - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this, loading: 'isSubmit' }, res => { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index f43adce8e..efa7258d3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -30,8 +30,8 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '39.98.140.126' -const prodInterfacePORT = '10005' +const prodIp = '101.36.227.25' +const prodInterfacePORT = '8033' // 判断环境 From a623ea65e9b205421d94a241faec0b5259498a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Jun 2021 15:37:45 +0800 Subject: [PATCH 3/3] commit --- .../foreignStandardsAndRegulations/index.vue | 54 +++++++------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 443894147..0c0fd9c14 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -236,7 +236,8 @@ 提交 - +
@@ -258,39 +259,35 @@ :options="standSortOptions" clearable/> - + - {{ opt.label}} - - + + {{ opt.label}} + - + + {{ opt.label}} + - {{ opt.label}} @@ -1004,7 +1001,7 @@ export default { standSort: '', standNumber: '', menuId: '', - advanceSearchVOStr: '' + sarStandardsSearch: '' }, searching: false, stahndinfoList: [], @@ -1748,9 +1745,9 @@ export default { this.getDomesticStandardTable() }, // 搜索 - getDomesticStandardTableBtn (advancedSearch) { + getDomesticStandardTableBtn (sarStandardsSearch) { this.standCommonlySearch.page = 1 - this.standCommonlySearch.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' + this.standCommonlySearch.sarStandardsSearch = JSON.stringify(sarStandardsSearch) || '' this.getDomesticStandardTable(2) }, // 清空搜索框 @@ -2045,7 +2042,6 @@ export default { // this.$refs['sarStandardsInfoForm'].resetFields() }) this.getOrgTreeSource() - // this.changeInlandSubclassVal() this.resolveFormFieldList() Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values @@ -2417,7 +2413,7 @@ export default { data.standSort = '' data.standNumber = '' } else { - data.advanceSearchVOStr = '' + data.sarStandardsSearch = '' } const formData = {...data} formData.menuId = this.selectSarMenu.id @@ -2441,6 +2437,7 @@ export default { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { _this: this, loading: 'loading' }, res => { + console.log('2441',formData); this.isAdvancedSearch = false if (res.ok) { for (let i = 0; i < res.data.list.length; i++) { @@ -2490,18 +2487,6 @@ export default { }, e => { }) }, - changeInlandSubclassVal () { - this.sarStandardsInfoEO.standSort = '' - this.$http.get('sys/dictype/pageStandClassify', { - dicTypeCode: 'CN' - }, { - _this: this - }, res => { - this.standSortOptions = res.data - this.standSortConfigOptions = res.data - }, e => { - }) - }, // 获取组织机构数据 getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, { @@ -3565,7 +3550,6 @@ export default { this.getGzzOption() }, e => { }) - // this.changeInlandSubclassVal() this.getDomesticStandardTable() // 加载所有的部门 this.getOrgTreeSource()