From b7be83ac0eb1798bd0536f9b03229b9a8372f7ff Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 22 Sep 2022 14:50:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/displayInformationModel.vue | 36 +++++++- .../components/problemKnowledgeBaseAdd.vue | 87 +++++++++++++++---- .../components/problemKnowledgeBaseList.vue | 8 +- .../library/docDetail/index.vue | 9 ++ 6 files changed, 124 insertions(+), 18 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ee96eeee6..6725b7b68 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1305,4 +1305,5 @@ module.exports = { inRecentMonths6:'In recent 6 months', inRecentYear1:'In recent 1 year', inRecentYear2:'In recent 2 year', + selectAll:'Select All', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f3c0d229a..531e3a061 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1406,4 +1406,5 @@ module.exports = { inRecentMonths6:'近6个月内', inRecentYear1:'近1年内', inRecentYear2:'近2年内', + selectAll:'全选', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index ec2a01540..abc196c39 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -30,6 +30,12 @@ +
+
+ + {{$t('selectAll')}} +
+
{ + res.showOrNot = true + this.dataListOne.forEach(val => { + if (res.id == val.id) { + val.showOrNot = true + } + }) + }) + }, searchQuery() { if (this.queryParam.labelName) { this.dataList = this.dataList.filter(res => { @@ -186,12 +202,28 @@ .text-operation { margin-right: 8px; } + ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } ::v-deep .ant-table-body { - background: transparent!important; + background: transparent !important; + } + + .box-content-right { + width: 100%; + text-align: right; + margin-bottom: 20px; + } + + .operator-text { + cursor: pointer; + margin-right: 13px; + font-size: 14px; + font-weight: 400; + color: #040B29; + display: inline-block; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 5cb25572b..425278f73 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -52,11 +52,11 @@
- + {{$t('market')}}
- - + + {{$t('standardNo')}}
- - + + + + + {{ item.standNumber }} + + + @@ -230,6 +241,7 @@ formInline: {}, loading: false, headers: '', + dictOptions: [], uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload', editorOption: { // 富文本框配置 placeholder: '', @@ -437,6 +449,16 @@ } else { this.isDisplay = false } + this.dictOptions = [] + if (this.formInline.standNumber) { + this.formInline.standNumber = this.formInline.standNumber.split(',') + this.formInline.standNumber.forEach((res, index) => { + this.dictOptions.push({ + standNumber: res, + id: this.formInline.bussDocumentLibraryId.split(',')[index] + }) + }) + } this.formInline = { ...this.formInline } } else { this.formInline = {} @@ -467,9 +489,6 @@ this.formInline = { ...this.formInline } }, onEditorChange({ quill, html, text }) { - console.log(html) - console.log(quill) - console.log(text) this.formInline.content = html }, handleInput(value) { @@ -500,10 +519,34 @@ } }, listAddModelForm(id, number) { - this.formInline.standNumber = number + this.formInline.standNumber = number.split(',') this.formInline.bussDocumentLibraryId = id + this.dictOptions = [] + if (number) { + number.split(',').forEach((res, index) => { + this.dictOptions.push({ + standNumber: res, + id: id.split(',')[index] + }) + }) + } this.formInline = { ...this.formInline } }, + onChange(value) { + console.log(value) + let content = [] + let standNumber = [] + value.forEach(res => { + this.dictOptions.forEach(val => { + if (res == val.standNumber) { + content.push(val.id) + standNumber.push(val.standNumber) + } + }) + }) + this.formInline.standNumber = standNumber + this.formInline.bussDocumentLibraryId = content.join(',') + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -532,6 +575,9 @@ this.$refs.ruleForm.validate(valid => { if (valid) { let formInline = JSON.parse(JSON.stringify(this.formInline)) + if (formInline.standNumber && formInline.standNumber.length > 0){ + formInline.standNumber = formInline.standNumber.join(',') + } this.loading = true this.confirmLoading = true let url = '' @@ -576,7 +622,11 @@ } } - + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 5c8328c34..d22898423 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -111,6 +111,11 @@ } }, mounted() { + let serial_number = localStorage.getItem('serial_number') + if (serial_number) { + this.searchStr = serial_number + localStorage.removeItem('serial_number') + } this.getList() this.replacePage() }, @@ -406,7 +411,8 @@ text-overflow: ellipsis; word-break: break-all; } - .box-content-left .ant-tag-checkable-checked{ + + .box-content-left .ant-tag-checkable-checked { border: 1px #21c9cc solid; color: #21c9cc; } diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index e28c012a2..cd3ab69b8 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -396,6 +396,15 @@ window.open(newUrl.href, '_blank') }, KnowledgeDatabaseClick() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } + localStorage.setItem('serial_number',serial_number) let newUrl = this.$router.resolve({ path: '/problemknowledgeBase', })