From 1860cfff5e2cd126474fb648eba390d782876d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 7 Sep 2022 15:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93=E7=9A=84=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 61 ++-- .../src/components/tableCollection/index1.vue | 61 ++-- .../components/countryCardView.vue | 22 +- .../components/problemKnowledgeBaseView.vue | 303 ++++++++++++++---- 4 files changed, 316 insertions(+), 131 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index c71311f19..b2974fbfc 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -856,7 +856,37 @@ .table .ant-table-column-title { font-weight: bold; } + + - + - \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 4252096b5..5c71d8910 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -2,7 +2,7 @@
-
+
@@ -15,76 +15,99 @@
-
-
-
- - {{$t('issuedBy')}}:{{this.queryForm.createBy}} - - - {{$t('releaseDate')}}:{{this.queryForm.createTime?this.queryForm.createTime.slice(0,11):''}} - -
-
-
- {{item.title}} - {{ $t('viewFile') }} +
+
+
+ + + + + + + + +
+
+ {{item.title}} + {{ $t('viewFile') }} - + {{queryForm[item.value]}} +
-
-
-
+
+
+
{{this.queryForm.browsingHistoryCount}} - + {{this.queryForm.praiseCount}} - + {{this.queryForm.collectCount}} -
-
-
- {{$t('comment')}}
-
- - - -
- - - -
-
-
-
-
- {{$t('release')}} - -
-
-
+
+
- {{item.createBy}} - {{item.createTime}} + {{$t('comment')}}
-
- {{item.commentContent}} + + + +
+ + + +
+
+
+
+
+ {{$t('release')}} + +
+
+
+
+ {{item.createBy}} + {{item.createTime}} + + + +
+
+
+ {{item.commentContent}} +
+
+
+
+ {{val.createBy}} + {{val.createTime}} + + + +
+
+
+ {{val.commentContent}} +
+
@@ -92,6 +115,34 @@
+ + + + +
+
+ * + {{$t('replyToComments')}} +
+ + + +
+
+
+
+
@@ -100,6 +151,10 @@ import SelectedBy from '@/components/SelectedBy/index' import { getAction, postAction, downloadFile, putAction } from '@/api/manage' import { mapGetters } from 'vuex' + import 'quill/dist/quill.core.css' + import 'quill/dist/quill.snow.css' + import 'quill/dist/quill.bubble.css' + import { quillEditor } from 'vue-quill-editor' export default { name: 'problemKnowledgeBaseView', @@ -109,6 +164,10 @@ }, data() { return { + visibleComment: false, + confirmLoading: false, + CommentQuery: {}, + formInlineComment: {}, standardContentList: [ { title: this.$t('problemClassification'), @@ -122,9 +181,17 @@ title: this.$t('standardNo'), value: 'standNumber' }, + // { + // title: this.$t('title'), + // value: 'title' + // }, { - title: this.$t('title'), - value: 'title' + title:this.$t('issuedBy'), + value: 'createBy' + }, + { + title:this.$t('releaseDate'), + value: 'createTime' }, { title: this.$t('enclosure'), @@ -134,6 +201,20 @@ ], queryForm: {}, formInline: {}, + rulesComment: { + replyContent: [ + { + required: true, + message: this.$t('replyToComments') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('replyToComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ] + }, rules: { commentContent: [ { @@ -156,6 +237,39 @@ }, methods: { ...mapGetters(['userInfo']), + messageClick(val) { + this.CommentQuery = val + this.visibleComment = true + this.formInlineComment = {} + this.$nextTick(() => { + this.$refs.ruleFormComment.clearValidate() + }) + }, + handleOkComment() { + this.$refs.ruleFormComment.validate(valid => { + if (valid) { + let query = { + commentId: this.CommentQuery.id, + replyContent: this.formInlineComment.replyContent + } + this.confirmLoading = true + postAction('/project/problemKnowledgeBaseReplyEO/add', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visibleComment = false + this.confirmLoading = false + this.releaseData() + } else { + this.confirmLoading = false + this.$message.success(this.$t('operationFailed')) + } + }) + } + }) + }, + handleCancelComment() { + this.visibleComment = false + }, SelectedByForm(userIds) { let query = { userIds: userIds, @@ -415,7 +529,7 @@ .text-field-right-url { color: #00B3BE !important; cursor: pointer; - margin-top: 10px; + /*margin-top: 10px;*/ } } } @@ -425,6 +539,9 @@ color: #040B29; font-weight: 400; word-break: break-word; + padding: 24px 0; + box-sizing: border-box; + margin-top: 32px; } .content-icon { @@ -449,12 +566,12 @@ } .content-icon-text .icon { - font-size: 24px; + font-size: 20px; color: #3b4249 !important; } .content-icon-text .icon-active { - font-size: 24px; + font-size: 20px; color: #00B3BE !important; } @@ -532,10 +649,76 @@ .content-text-top { width: 100%; text-align: right; - color: #040B29; + color: #6F7385; font-weight: 400; - font-size: 16px; + font-size: 14px; margin-bottom: 20px; } + .doc-detail-box { + width: 100%; + background: #f2f2f2; + } + + .doc-detail-box-text { + width: 75%; + margin: 0 auto; + background: #fff; + } + + .division { + height: 20px; + position: absolute; + left: 0; + width: 100%; + background: #f2f2f2; + margin-top: 20px; + } + + .content-index { + font-size: 14px; + color: #000F16; + font-weight: 400; + word-break: break-word; + padding: 12px 0; + box-sizing: border-box; + } + + .header-text-index { + font-size: 16px; + font-weight: 400; + margin-top: 10px; + height: 35px; + color: #000F16; + line-height: 40px; + } + + .box-icon { + margin-right: 10px; + float: right; + cursor: pointer; + } + + .box-comment { + width: calc(100% - 80px); + margin-left: 80px; + background: #f2f2f2; + padding: 6px 24px; + box-sizing: border-box; + } + + .Required { + color: red; + margin-right: 4px; + } + + .header-text-index-left { + font-size: 16px; + font-weight: 700; + } + + .header-text-index-text { + font-size: 14px; + color: #848684; + } \ No newline at end of file