From 9f4768eb28d50f8e770dda28a3ce54ae5056e1c8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 6 Aug 2021 17:13:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=20=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E6=97=B6=E9=97=B4=20=E5=85=B6=E4=BB=96=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=9B=9E=E6=98=BE=E7=9A=84=E5=86=85=E5=AE=B9=E5=81=9A?= =?UTF-8?q?=E6=88=90=E6=82=AC=E6=B5=AE=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 5e825cfc8..377f873c3 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -12,8 +12,14 @@ 产品平台: {{ localProEO.projectPlatfor }} 项目编号: {{ localProEO.projectNumber }} - 项目名称: {{ localProEO.projectName }} - + + +
{{ localProEO.projectName }}
+
+
项目名称: {{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}
+
项目名称: {{localProEO.projectName}}
+ + 项目分类:{{ localProEO.projectClassification }} @@ -449,7 +455,7 @@ export default { let deleteTagList = [] this.selectList1.forEach(item => { //项目id-标准id,项目id-标准id - deleteTagList.push( this.proId + '-' + item ) + deleteTagList.push(this.proId + '-' + item) }) this.id = deleteTagList.join(',') this.$http.post('sarStandProjectLibrary/deleteByIds', { @@ -726,6 +732,7 @@ export default { this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.setMap(this.zrbmMap, res.data.ZRBMCLASS) this.setMap(this.textStatusMap, res.data.WBZTCLASS) + console.log(this.getLocalPro) this.showLocalProductData(this.getLocalPro) }, e => { }) From 059ce00b8b29708f752bf70df1003ebf9122987f Mon Sep 17 00:00:00 2001 From: song2048 <2639528268@qq.com> Date: Sun, 8 Aug 2021 16:07:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 1 + src/components/navMenu/index.vue | 5 +++++ src/pages/regulatoryRepository/dataStatis/index.vue | 13 +++++++++++++ src/router/index.js | 12 ++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 src/pages/regulatoryRepository/dataStatis/index.vue diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 611f46333..f21179876 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -43,6 +43,7 @@ :class="{'disabled': disabled}" multiple drag + :show-file-list="showUploadlist" :on-success="uploadSuccess" :before-upload="beforeUpload" diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5f429c122..1feddb37c 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,6 +88,11 @@ export default { path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, + { + title: '标准法规工作组数据统计', + path: '/dataStatisComments', + menuId: '' + }, { title: '海外标准法规', path: '/foreignStandardsAndRegulations', diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue new file mode 100644 index 000000000..3ada7755b --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 590a4b6f0..95ce6e580 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1097,6 +1097,18 @@ const routes = [ menuId: 'A59EFAQ7AC' } }, + //标准法规工作组数据统计 + { + path: '/dataStatisComments', + name: 'dataStatisComments', + component: () => + import('@/pages/regulatoryRepository/dataStatis/index'), + meta: { + requireAuth: true, + title: '标准法规工作组数据统计', + menuId: '' + } + }, // 标准征求意见 { path: '/standardForComments', From 7c914758c03fba80f837ce61d9ffd4405eda9d6a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 8 Aug 2021 16:20:35 +0800 Subject: [PATCH 3/5] feat: There is no way the --- .../searchCenter/pages/standardSearch.vue | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 445de500b..4f964875a 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -973,7 +973,7 @@ option.title = '监管类型' option.index = 12 break - case 'CYSDXX': + case 'WSCYSD': option.title = '我司参与深度' option.index = 13 break @@ -1003,6 +1003,7 @@ }) } this.searchOriginOptions = this.searchOptions + console.log(this.searchOriginOptions) this.saveAllSortOptions = res.data.STANDCLASSIFY this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组 @@ -1027,20 +1028,20 @@ filterOptions.standSort = originOptions.standSort filterOptions.standSort.index = 1 // 标准状态 - filterOptions.standState = originOptions.standState - filterOptions.standState.title = '标准状态' - filterOptions.standState.index = 2 + // filterOptions.standState = originOptions.standState + // filterOptions.standState.title = '标准状态' + // filterOptions.standState.index = 2 // 我司参与状态 filterOptions.CYSD = originOptions.CYSD filterOptions.CYSD.title = '我司参与深度' - filterOptions.CYSD.index = 3 + filterOptions.CYSD.index = 2 // 监管类型 - filterOptions.ZRLX = originOptions.ZRLX - filterOptions.ZRLX.title = '监管类型' - filterOptions.ZRLX.index = 4 + // filterOptions.ZRLX = originOptions.ZRLX + // filterOptions.ZRLX.title = '监管类型' + // filterOptions.ZRLX.index = 4 // 适用车辆类型 filterOptions.CLLX = originOptions.CLLX - filterOptions.CLLX.index = 5 + filterOptions.CLLX.index = 3 // 采标程度 // filterOptions.CBCD = originOptions.CBCD // filterOptions.CBCD.index = 6 @@ -1322,7 +1323,7 @@ return 'bussBigClass' case 'ACCESSTYPE': return 'ZRLX' - case 'CYSDXX': + case 'WSCYSD': return 'CYSD' default: return key From 6770fad07b49ccd02f5d4e19931f4b54337c4d87 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 8 Aug 2021 16:29:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9B=B6=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E7=BC=96=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 5 +++++ .../regulatoryRepository/partCodeApply/index.vue | 13 +++++++++++++ src/router/index.js | 12 ++++++++++++ src/sysConfig/index.js | 4 ++-- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/pages/regulatoryRepository/partCodeApply/index.vue diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index b68a266c5..ba0dfdad9 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,6 +88,11 @@ export default { path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, + { + title: '零部件编号申请', + path: '/partCodeApply', + menuId: '' + }, { title: '标准法规工作组数据统计', path: '/dataStatisComments', diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue new file mode 100644 index 000000000..4fb363ee1 --- /dev/null +++ b/src/pages/regulatoryRepository/partCodeApply/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 95ce6e580..010ac773b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1097,6 +1097,18 @@ const routes = [ menuId: 'A59EFAQ7AC' } }, + //零部件编号申请 + { + path: '/partCodeApply', + name: 'partCodeApply', + component: () => + import('@/pages/regulatoryRepository/partCodeApply/index'), + meta: { + requireAuth: true, + title: '零部件编号申请', + menuId: '' + } + }, //标准法规工作组数据统计 { path: '/dataStatisComments', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d2960cf5d..8571d2d34 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '10.96.10.171' // const devInterfacePORT = '9999' -const devIp = '10.96.170.156' +const devIp = 'localhost' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -31,7 +31,7 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 const prodIp = '62.234.136.153' -const prodInterfacePORT = '8038' +const prodInterfacePORT = '8033' // 判断环境 From 398e64f545bd35536fb994e30dc89d012094dc85 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 8 Aug 2021 16:56:15 +0800 Subject: [PATCH 5/5] feat: issueTime --- src/pages/searchCenter/pages/standardSearch.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 4f964875a..3b70f1a4a 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -103,8 +103,8 @@ align="center" :label="$t('m.issueTime')">