From 0321736a76d52a2bd819f89b36f36af80db1ab6e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 Aug 2021 10:06:05 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20=E4=B8=80=E8=88=AC=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/pages/standardSearch.vue | 4137 ++++++++++++----- 1 file changed, 3014 insertions(+), 1123 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index df7562c04..c350b9cf4 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -1,1156 +1,3047 @@ From 4a8942c4fe3208326a9599a8b701b017de5044cd Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 Aug 2021 10:08:26 +0800 Subject: [PATCH 02/10] feat: search to home1 --- src/pages/searchCenter/pages/standardSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index c350b9cf4..445de500b 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -22,7 +22,7 @@
高级检索
 - +
首页
 From e6c9e97d9ba461737409307f8b6776cd96d8fe56 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 6 Aug 2021 10:16:20 +0800 Subject: [PATCH 03/10] commit --- src/components/mySelect/index.vue | 89 ++++++------------- .../attributeCustom/components/stand.vue | 4 +- .../pages/creatProcess/bzjd/step1.vue | 24 ++++- .../pages/creatProcess/bzjd/step2.vue | 4 +- .../pages/creatProcess/bzzqyj/step1-1.vue | 23 ++++- .../pages/creatProcess/bzzqyj/step1.vue | 23 ++++- src/router/index.js | 1 + 7 files changed, 92 insertions(+), 76 deletions(-) diff --git a/src/components/mySelect/index.vue b/src/components/mySelect/index.vue index d741c70e5..63858ef55 100644 --- a/src/components/mySelect/index.vue +++ b/src/components/mySelect/index.vue @@ -3,7 +3,7 @@
- +
{{ item.label }} + @@ -76,65 +77,29 @@ .active { background-color: rgb(245, 247, 250); } - /*ul {*/ - /* position: absolute;*/ - /* z-index: 9999;*/ - /* background-color: rgb(255, 255, 255);*/ - /* box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px 0px;*/ - /* box-sizing: border-box;*/ - /* border-width: 1px;*/ - /* border-style: solid;*/ - /* border-color: rgb(228, 231, 237);*/ - /* border-image: initial;*/ - /* border-radius: 4px;*/ - /* box-sizing: border-box;*/ - /* list-style: none;*/ - /* padding: 6px 0px;*/ - /* margin: 0px;*/ - /* display: block;*/ - /* list-style-type: disc;*/ - /* margin-block-start: 1em;*/ - /* margin-block-end: 1em;*/ - /* margin-inline-start: 0px;*/ - /* margin-inline-end: 0px;*/ - /* width: 100%;*/ - /* li {*/ - /* list-style:none;*/ - /* height: 34px;*/ - /* line-height: 34px;*/ - /* padding: 0 20px;*/ - /* }*/ - /* li:hover {*/ - /* background-color: rgb(245, 247, 250);*/ - /* }*/ - /*}*/ - /*.mySelect {*/ - /* width: 100%;*/ - /* position: relative;*/ - /* option {*/ - /* height: 34px;*/ - /* line-height: 34px;*/ - /* padding: 0 20px;*/ - /* }*/ - /*}*/ - /*.mySelect:focus + .myIcon{*/ - /* transform:rotate(180deg);*/ - /* -ms-transform:rotate(180deg); !* IE 9 *!*/ - /* -moz-transform:rotate(180deg); !* Firefox *!*/ - /* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/ - /* -o-transform:rotate(180deg);*/ - /*}*/ - /*.mySelect:focus-within + .myIcon{*/ - /* transform:rotate(180deg);*/ - /* -ms-transform:rotate(180deg); !* IE 9 *!*/ - /* -moz-transform:rotate(180deg); !* Firefox *!*/ - /* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/ - /* -o-transform:rotate(180deg);*/ - /*}*/ - /*.myIcon {*/ - /* position: absolute;*/ - /* right: 7px;*/ - /* top: calc(~'50% - 7px');*/ - /* transition: all .3s;*/ - /*}*/ + .mySelect { + width: 100%; + position: relative; + } + .mySelect:focus + .myIcon{ + transform:rotate(180deg); + -ms-transform:rotate(180deg); /* IE 9 */ + -moz-transform:rotate(180deg); /* Firefox */ + -webkit-transform:rotate(180deg); /* Safari 和 Chrome */ + -o-transform:rotate(180deg); + } + .mySelect:focus-within + .myIcon{ + transform:rotate(180deg); + -ms-transform:rotate(180deg); /* IE 9 */ + -moz-transform:rotate(180deg); /* Firefox */ + -webkit-transform:rotate(180deg); /* Safari 和 Chrome */ + -o-transform:rotate(180deg); + } + .myIcon { + cursor: pointer; + position: absolute; + right: 7px; + top: calc(~'50% - 7px'); + transition: all .3s; + } diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index 6dbb4e219..af18030c8 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -353,7 +353,7 @@ export default { showRegionId: '', selVal: '', isSearch: '1', - sarType: '', + sarType: 'STAND', isWarn: '1' }, attrTypeOptions: [ @@ -561,7 +561,7 @@ export default { queryDisplayLocationList (sarType) { return new Promise((resolve, reject) => { this.$http.get('lawssBase/utArea/getAreaList', { - sarType: 'INLAND_STAND' + sarType: sarType }, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 8df138551..e585ffffa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -235,8 +235,7 @@ width="170" align="center"> - - + - - + { this.$set(this.textStatusMap, item.value, item.label) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 45d18b0dc..489a91441 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -272,14 +272,14 @@ choiceZRRS (row, type, index) { this.type = type if (type === 1) { - this.drawerTitle = '选择责任部门对接人' + this.drawerTitle = '选择执行人' this.nodeList2 = [] this.zxIndex= index this.nodeList2.push(row) this.modalshowflag2 = true } else { // 批量 - this.drawerTitle = '批量选择责任部门对接人' + this.drawerTitle = '批量选择执行人' if (this.zxIdList.length > 0) { this.nodeList2 = [] this.modalshowflag2 = true diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 06d10b06c..af104870f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -220,13 +220,13 @@ @@ -361,6 +361,23 @@ } }, methods: { + // 点击查看 + handlePreview (item) { + let pageType + if (item.standType === 'FOREIGN') { + pageType = 'FOREIGN_STAND' + } else { + pageType = 'INLAND_STAND' + } + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: pageType + } + }) + window.open(routeUrl.href, '_blank') + }, getData () { queryTaskFirst({ bpnId: this.$route.query.bpnId diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 1f82da739..cbfc3ee3e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -221,13 +221,13 @@ @@ -361,6 +361,23 @@ export default { } }, methods: { + // 点击查看 + handlePreview (item) { + let pageType + if (item.standType === 'FOREIGN') { + pageType = 'FOREIGN_STAND' + } else { + pageType = 'INLAND_STAND' + } + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: pageType + } + }) + window.open(routeUrl.href, '_blank') + }, addZqyjList() { this.title = '国内外标准库' this.listModel = true diff --git a/src/router/index.js b/src/router/index.js index 40040f9a2..590a4b6f0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1708,6 +1708,7 @@ const routes = [ meta: { requireAuth: true, title: '征求意见详情', + parentPath: '/standardForComments', // isBoolean: true, // menuId: '' } From 4d1eff6eb25f65623a104f008ce90b2e8a732a45 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 6 Aug 2021 10:17:22 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86--?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 3f07616db..fd2a4796b 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -51,12 +51,20 @@ prop="showNumber" label="标准号/政策号" align="center"> + + Date: Fri, 6 Aug 2021 10:38:43 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9--?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BA=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standContrast/pages/contrastDetails.vue | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue index 6e42c79aa..8e6d60755 100644 --- a/src/pages/localTool/standContrast/pages/contrastDetails.vue +++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue @@ -57,8 +57,8 @@ label="标准号/政策号" align="center"> { From 68777a0c87503edc1b9128669fc77577c40d6a35 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 10:51:08 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 11 +- .../pages/details.vue | 236 +++++++++--------- .../pages/otherAddEit.vue | 11 +- .../pages/projectAddEit.vue | 11 +- 4 files changed, 147 insertions(+), 122 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 883ef6927..2d70086ad 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -119,13 +119,15 @@ - + 导出 - - - 高级查询 - - + 高级查询 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 确认 - -
- - - -
@@ -358,6 +266,101 @@
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 搜索 + 取消 +
+ + {{ $t("m.dataAcquisition") }} @@ -368,6 +371,7 @@ export default { name: "AccessStandardDetails", data() { return { + isAdvancedSearch: false, // 高级检索状态 showSelectBox: true, textStatusMap: {}, @@ -519,11 +523,6 @@ export default { // this.$router.push(this.$store.state.detailMap) // this.$store.commit('setDetailMap', '') }, - selectSuper() { - this.page = 1; - this.standardForm.page = 1; - this.selectInfoMore(); - }, // 搜索 selectProductBtn() { this.page = 1; @@ -535,11 +534,6 @@ export default { this.standardForm.zrbm = '' this.standardForm.standName = '' this.standardForm.responseUnit = '' - this.standardFormList.standName = '' - this.standardFormList.typeApplicable = '' - this.standardFormList.nylx = '' - this.standardFormList.zrbm = '' - this.standardFormList.sycpx = '' this.selectInfobyAccid() this.selectInfoMore() }, @@ -701,18 +695,31 @@ export default { * 高级检索 */ selectMoreBtn() { - this.showSelectBox = !this.showSelectBox + this.isAdvancedSearch = true + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' this.showTableFlag = false - if (!this.showSelectBox) { - // this.standardForm = {} - // this.standardForm.issueTime = '' - // this.standardForm.textStatus = '' - // this.standardForm.modifyTime = '' - } this.page = 1 this.standardForm.page = 1 this.selectInfoMore() }, + queryInfo() { + this.page = 1; + this.standardForm.page = 1; + this.selectInfoMore(); + this.isAdvancedSearch = false + }, + backInfo() { + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' + this.isAdvancedSearch = false + }, // 获取工作组信息下拉框信息 getGzzOption() { this.$http.get("lawss/sarGroupMenu/queryGroup", "", { @@ -927,10 +934,8 @@ export default { } } } - .labelBox { - /deep/ .el-form-item__label { - padding-right: 5px; - } + .labelForm { + margin-top: 20px; } /deep/ .relateClass { & > button { @@ -964,7 +969,7 @@ export default { } /deep/.showBox{ - width: 165px; + width: 300px; } .iconClass { width: 18px; @@ -989,7 +994,6 @@ export default { cursor: pointer } } - .relateClass { .el-dialog__body { max-height: 460px; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 42cb7de2a..cb8e18827 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -104,13 +104,15 @@ - + - + Date: Fri, 6 Aug 2021 11:20:38 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index cbdf615b8..7ae835bc2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -188,7 +188,7 @@ label="相对于国行标差异点"> From 5b8a528da670da8f238759d0f99efe9bafe71078 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 Aug 2021 14:02:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?feat:=20=E4=B8=8D=E4=BC=9A=E7=AD=BE=20?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=20=E4=BF=AE=E8=AE=A2=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 32977c38e..c38d5d117 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -810,7 +810,7 @@ - +

修订申请人

From 8ef1fdeaef89c662493b45e9c752b99f8660a5c4 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 6 Aug 2021 14:04:48 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=9F=A5=E7=9C=8B=E7=9A=84dialog=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E8=BF=87=E5=A4=A7=E7=9A=84ui=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 01f2866bd..22cb60d74 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,6 +203,7 @@ + 查看 @@ -224,7 +225,7 @@ destroy-on-close :wrapperClosable="false" class="seeHisToryDraw" - size="1000px" + size="600px" >
From 930759eaa5d226ce550789b11203110ed0600603 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 14:08:37 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=8D=E4=BC=9A=E7=AD=BE=20=E5=9C=A8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E8=AE=A2=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c38d5d117..b00082a3f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -810,7 +810,7 @@ - +

修订申请人