From d28efab59e0fcbc0af394178552f55c0debbc4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 24 Nov 2021 09:24:30 +0800 Subject: [PATCH 1/7] commit --- src/pages/home2/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index a8dbebf6c..ee56d41a2 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -186,7 +186,7 @@ export default { padding: 0; } .footer { - height: 90px; + height: 70px; line-height: 33px; //margin-top: 0.3vh; //line-height: 5.2vh; From 5c057b6e86b12fdc2a2f26e09631b49922ec328d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 24 Nov 2021 09:34:04 +0800 Subject: [PATCH 2/7] commit --- src/components/navMenu/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 0e0b6cc72..919158cb7 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -706,7 +706,7 @@ export default { } .el-menu-item { padding-left: 29px !important; - font-size: 15px; + font-size: 14px; font-weight: normal; height: 40px; line-height: 40px; From edff9d419875f4a749161de3694eddefbdc51872 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 24 Nov 2021 10:06:18 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step4.vue | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 6b47933c8..4ab48c3bf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1629,19 +1629,6 @@ export default { } }) }, - getTaskId () { - queryTaskFirst({ - bpnId: this.$route.query.bpnId - }).then(res => { - let mes = JSON.parse(res.mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.roleForm = mes.roleForm - this.commentText = mes.commentText - this.taskIds=mes.taskIds - //表单文件处理 - this.getFormFieldList(mes.form) - }) - }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true @@ -2215,7 +2202,12 @@ export default { if (res) { const processForm = JSON.parse(res.mesg) this.commentText = processForm.commentText - this.getFormFieldList(processForm) + if (processForm.form === undefined) { + this.getFormFieldList(processForm) + } else { + //表单文件处理 + this.getFormFieldList(processForm.form) + } } }).catch(e => { console.log("错误") @@ -2238,7 +2230,6 @@ export default { this.form.prcName = this.prcName this.form['id'] = item.id - console.log("this.form",this.form); // 遍历对象 for(const p in this.form) { @@ -2328,22 +2319,22 @@ export default { this.form.country=this.countryArr; this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) - _formData.append('createUser', this.$store.getters.userInfo.userId) - _formData.append('createUserName', this.$store.getters.userInfo.uName) + _formData.append('id', this.bpnId) + // _formData.append('createUser', this.$store.getters.userInfo.userId) + // _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', '1') _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, commentText: this.commentText, - taskInfo: '申请人修订', - taskIds:this.taskIds + // taskInfo: '申请人修订', + // taskIds:this.taskIds })) - saveTaskFirst(_formData).then(res => { + saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) @@ -2442,7 +2433,6 @@ export default { this.getData() }, mounted () { - this.getTaskId() this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this From 34da9dac6751f53ab613ff6955da8fb469463ccb Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 24 Nov 2021 10:08:19 +0800 Subject: [PATCH 4/7] commit --- .../domesticStandardsAndRegulations/index.vue | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a9f099601..bc5f1bd58 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1766,6 +1766,7 @@ :visible.sync="OCRModel" size="900px" custom-class="demo-drawer" + :before-close="OCRclose" >
@@ -1790,6 +1791,14 @@ label="文件名" align="center"> + + +
@@ -2553,10 +2562,20 @@ } }, methods: { + setWBType (type) { + let text = '' + for (let a = 0; a < this.OCRoptions.length; a++) { + if (this.OCRoptions[a].attrField === type) { + text = this.OCRoptions[a].attrName + } + } + return text + }, selectOCRChange (val) { this.OCRDatas = val }, OCRclose () { + this.OCRData = [] this.OCRModel = false }, OCRsubmit () { @@ -2622,21 +2641,20 @@ this.$message.warning('请选择一条数据进行' + text) } else { this.OCRModel = true - this.OCRLoading = false + this.OCRLoading = true this.$http.get('lawss/sarStandFile/queryFileInfoNew', { type: type, standId: this.selectedList[0] },{ _this: this }, res => { + this.OCRLoading = false if (res.ok) { if (res.data.length > 0) { this.OCRData = res.data - this.OCRLoading = false } else { this.$message.warning('当前标准没有' + text + '文件') this.this.OCRData = [] - this.OCRLoading = false } } }) @@ -5302,6 +5320,7 @@ _this: this }, res => { this.OCRoptions = res.data + console.log(res.data); }) this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this From c7289ded9e2c100ab27e40ebdb5d78c51abcf359 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 24 Nov 2021 10:28:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8F=AA=E8=83=BD=E5=9C=A81366=E4=B8=8B?= =?UTF-8?q?=E7=9C=8B=E7=9D=80=E8=BF=98=E4=B8=8D=E9=94=99=E7=9A=84=E9=A2=84?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standWarning.vue | 118 ------------------------ src/pages/localTool/standardWarning.vue | 52 +++++++---- 2 files changed, 33 insertions(+), 137 deletions(-) delete mode 100644 src/pages/localTool/standWarning.vue diff --git a/src/pages/localTool/standWarning.vue b/src/pages/localTool/standWarning.vue deleted file mode 100644 index 2b6d6b055..000000000 --- a/src/pages/localTool/standWarning.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - - diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 5baf5253a..563d59441 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -8,9 +8,9 @@
-
-
实施预警
-
+ + +
@@ -27,12 +27,21 @@ placeholder="根据标准名称查找"> - - - + + + + {{ opt.label }} + + + + + + + +
-
- 实施日期预警 +
+ { - // this.height = $(".content").height() * 0.4; - // }; + this.height = $(".content").height() * 1.8; + window.onresize = () => { + this.height = $(".content").height() * 1.8; + }; //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => { this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 this.zrgcs = res.data.ZRGCSCLASS; this.loading[this.field] = true this.$http.get('sys/EarlyWarning/StandWarning', { @@ -1015,8 +1026,11 @@ export default { } .more { - margin-top: 30px; + display: flex; + align-items: center; + + justify-content: center; /deep/ .el-input__inner { width: 185px; } @@ -1027,13 +1041,13 @@ export default { } } - cursor: pointer; + //cursor: pointer; color: #12508e; - position: absolute; + //position: absolute; top: 0; right: 0; z-index: 100; - padding: 5px 10px; + //padding: 5px 10px; // &:hover { // color: #fff; // background: #12508e; From 07e8d76398c57c735472fe54227fd61aeda474c0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 24 Nov 2021 10:49:42 +0800 Subject: [PATCH 6/7] commit --- src/pages/localTool/standContrast/index.vue | 8 +++++ .../standContrast/pages/contrastDetails.vue | 31 +++++++++++++------ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue index 43ef1da5b..b8a4545bd 100644 --- a/src/pages/localTool/standContrast/index.vue +++ b/src/pages/localTool/standContrast/index.vue @@ -92,6 +92,14 @@ label="比对类型" align="center"> + + + + + { + this.spinShow = true + this.$http.post('lawss/sarStandCompareHis/fullTextComparison', { + leftStandard:this.selectedSplitStandList[0].id, + rightStandard: this.selectedSplitStandList2[0].id, + }, { + _this: this + }, res => { + this.spinShow = false + this.$message.warning(res.data) + }, e => { + }) + }) + // this.$router.push({ + // name: 'TextComparison', + // query: { + // infoIdLeft: this.selectedSplitStandList[0].id, + // infoIdRight: this.selectedSplitStandList2[0].id, + // rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]), + // rowDataRight: JSON.stringify(this.selectedSplitStandList2[0]) + // } + // }) }, addFileStandPageChange (page) { this.addFilePage = page From 569469b865c25e7d8a7ecb1b0d907423f0593fa3 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 24 Nov 2021 11:02:49 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E9=AB=98=E5=BA=A6=E7=9A=84=E9=A2=84?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 34 ++++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 563d59441..c291b649e 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -113,11 +113,12 @@
-
+
{ - this.height = $(".content").height() * 1.8; + this.warningTableHeight = $(window).height()*0.54; + }; + // alert(this.warningTableHeight) + this.height = $(".content").height(); + window.onresize = () => { + this.height = $(".content").height(); }; //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { @@ -1055,6 +1062,17 @@ export default { // } } + .content { + padding-bottom: 10px; + height: calc(~'100% - 40px'); + + /deep/ .el-button--mini { + padding: 5px 7px; + font-size: 8px; + } + + } + .dynamic-loop-container { position: relative; min-height: 160px; @@ -1134,15 +1152,7 @@ export default { } } - .content { - padding-bottom: 10px; - height: calc(~'100% - 40px'); - /deep/ .el-button--mini { - padding: 5px 7px; - font-size: 8px; - } - } } ::v-deep {