From 418fcc30229af1ee780ab50b0ad335c00dcab110 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 10 Jun 2022 11:15:26 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2ES=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=20=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=88=86=E8=AF=8D=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/pages/standardSearch.vue | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 3cc22b0de..64efb31e5 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -509,10 +509,31 @@ const list = items.filter ( item => !item.type || item.type === this.selectIndex); return list }, - checkItems (item) { - this.itermsConditionsFlag = true - this.itermsConditionsTitle1 = item.textContent - this.itermsConditionsTitle2 = item.textItems + async checkItems (item) { + let detilsData = await this.searchSarBykeyByDetils(item) + if (detilsData.ok && detilsData.data) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle1 = detilsData.data.textContent.replace(/null/g, '- -') + this.itermsConditionsTitle2 = detilsData.data.textItems + } else { + } + }, + + searchSarBykeyByDetils(item) { + return new Promise((resolve, reject) => { + const allList = {} + allList.selectIndex = 'fulltextserch' + allList.selectValue = this.keywords + allList.standId = item.id + this.$http.post('search/searchCenter/searchSarBykeyByDetils', allList, { + _this: this, + loading: 'resultLoading' + }, res => { + const history = res; + resolve(history) + }, e => { + }) + }) }, itermsConditionsClose () { this.itermsConditionsFlag = false From 36091d86113c7f4b2cc7c20d62647f23745425ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 10 Jun 2022 13:36:39 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=97=AE=E7=AD=94=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 12 ++++ .../details/otherStandardDetails/index.vue | 13 +++- .../components/questions-item.vue | 1 - .../personal/pages/my-questions/index.vue | 16 ++++- .../standQA/components/questionItemInfo.vue | 1 + .../standQA/components/questions-item.vue | 40 ++++++----- .../regulatoryRepository/standQA/index.vue | 70 +++++++++++++++++-- 7 files changed, 124 insertions(+), 29 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index cd58896bc..dd53790ec 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -333,6 +333,7 @@ 更新记录 + 标准问答 @@ -2949,6 +2950,17 @@ export default { this.relateDialog1 = true this.relateNowList1 = list }, + //标准问答按钮 + knowledgeSharing() { + this.$router.push({ + path: '/standQA', + query:{ + standId: this.$route.params.id, + standType: 'BUSINESS_STAND', + sourceType: 'details', + } + }) + }, // 更新LOG relateEvent () { this.$http.get('lawss/sarUpdLog/getLogList', { diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 7d92ae364..cefcccc97 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -30,7 +30,7 @@ 更新记录 - + 标准问答 @@ -2454,9 +2454,16 @@ export default { pageSizeChange1() { this.getKnowList() }, + //标准问答按钮 knowledgeSharing() { - this.knowledgeSharingDialog = true - this.getKnowList() + this.$router.push({ + path: '/standQA', + query:{ + standId: this.$route.params.id, + standType: this.sarStandardsInfoEO.standType, + sourceType: 'details', + } + }) }, // 获取知识点列表数据 getKnowList() { diff --git a/src/pages/personal/pages/my-questions/components/questions-item.vue b/src/pages/personal/pages/my-questions/components/questions-item.vue index b7c409f56..a4f3fb635 100644 --- a/src/pages/personal/pages/my-questions/components/questions-item.vue +++ b/src/pages/personal/pages/my-questions/components/questions-item.vue @@ -36,7 +36,6 @@ export default { immediate: true, deep: true, handler(val){ - console.log(val); } } } diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 81ea17608..b2bddf81f 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -817,7 +817,7 @@ 相似历史问题：
-
+
{{item.problemDescription}} {{item.questionTime}}
@@ -1334,8 +1334,18 @@ export default { } }), //点击跳转问题详情 - historyJump(id){ - this.$router.push('/standQA') + historyJump(item){ + this.$router.push({ + path: '/standQA', + query:{ + standId: item.standardId, + queId: item.id, + standType: item.classification, + sourceType: 'dialog', + standName: item.standardName, + } + }) + this.dialogVisible = false }, // 点击查看 handlePreview(item) { diff --git a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue index 00b0653e1..6e40ad4fb 100644 --- a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue +++ b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue @@ -48,6 +48,7 @@ export default { deep: true, handler(val) { this.answer = val + console.log(val); } } } diff --git a/src/pages/regulatoryRepository/standQA/components/questions-item.vue b/src/pages/regulatoryRepository/standQA/components/questions-item.vue index 82d5f6d9e..4964aa64b 100644 --- a/src/pages/regulatoryRepository/standQA/components/questions-item.vue +++ b/src/pages/regulatoryRepository/standQA/components/questions-item.vue @@ -1,26 +1,28 @@