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/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/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/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/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f408417b..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) { @@ -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 @@ -3313,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 @@ -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/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue index 6493d5103..f5f5a218e 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue @@ -5,6 +5,7 @@
+
{{opinionList.standardName }}
管理征求意见
@@ -64,7 +65,6 @@ label="提出人" width="170"> - @@ -226,7 +226,7 @@ export default { line-height: 35px; .transition-box-label{ display: inline-block; - width: 80px; + width: 100px; vertical-align: top; } .transition-box-span{ @@ -268,6 +268,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 1ceed10c7..3673e24cd 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -297,6 +297,7 @@ export default { } .effect { margin-left: 10px; + margin-bottom: 10px; } .container { height: calc(~'100% - 52px - 55px - 50px');