From 4920591330ef3453141faf49b8da30527044d726 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 16 May 2023 11:23:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4=20=20?= =?UTF-8?q?=E6=8B=86=E5=88=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index f759deef8..6feb650ef 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -888,7 +888,7 @@ export default { } }) } else { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoSplitPage', { page: this.conditionForm.page, pageSize: this.conditionForm.pageSize, standNumber: this.conditionForm.numberName, From 029c3e9ec1e7ee10a8f10573cb6f3a3fa32a5869 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 16 May 2023 11:30:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/cancel.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/component/delay.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 1de64f30b..02aa9e5df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -461,7 +461,7 @@ export default { // this.standinfoList.push(item) // } // }) - this.total = this.standinfoList.length + this.total = res.data.count this.$nextTick(()=>{ this.$refs.selection.doLayout(); }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 241d95d77..cf41a8be1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -480,7 +480,7 @@ export default { // this.standinfoList.push(item) // } // }) - this.total = this.standinfoList.length + this.total = res.data.count this.$nextTick(()=>{ this.$refs.selection.doLayout(); }) From d9873dd7cc2d867bd23f7092149a3f82517c51c9 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 16 May 2023 13:34:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E5=8D=95=E5=9C=A8=E8=8D=89=E7=A8=BF=E4=B8=AD=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index b5127e596..0f0e15e16 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -430,6 +430,12 @@ export default { break } this.qbfsForm = item.qbfsForm || item + if(!this.qbfsForm.LXD || this.qbfsForm.LXD == ''){ + this.qbfsForm.LXD = this.qbfsForm.lxd + } + if(!this.qbfsForm.LXDName || this.qbfsForm.LXDName == ''){ + this.qbfsForm.LXDName = this.qbfsForm.lxdName + } // this.isTrue = false // this.$nextTick(()=>{ // this.isTrue = true From 9e47ccb08e8fd6eb44a64ac17f23af1c3bad30b4 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 16 May 2023 14:07:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AF=BC=E5=85=A5=20?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 6feb650ef..93963384a 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -437,8 +437,10 @@
1.导入的文档是zip格式
2.图片为jpg、jpeg、png、gif格式
- 3.文档中的图片，在导出excel中以链接的形式展示，点击链接跳转到本地指定的文件
- 4.文档中的表格，在导出excel中以链接的形式展示，点击链接跳转到指定的sheet页面
+ 3.文档中的图片，在导出Excel中以链接的形式展示，点击链接跳转到本地指定的文件
+ 4.导入时,表格Sheet页名称保持一致即可,无需使用超链接。
+ 5.导入时,表格Sheet页中的表格需要遵循最左原则，即由第一行第一列开始。
+ 6.文档中的表格，在导出Excel中以链接的形式展示，点击链接跳转到指定的Sheet页面。
知道了