From 352fcc12243d2e4b3b7210e5dc0518a311224c8e Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 12 Aug 2022 10:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classificationMaintenanceAdd.vue          |  7 +++--
 .../components/countryCardReleaseModelAdd.vue | 12 ++++----
 .../components/problemKnowledgeBaseList.vue   |  1 +
 .../components/commentList.vue                |  4 +--
 .../components/comparisonResults.vue          |  3 +-
 .../components/documentDataComparison.vue     | 29 +++++++++++--------
 .../components/initiateComparison.vue         |  5 ++--
 7 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue
index b1d02eb16..81b080a51 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue
@@ -19,7 +19,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="problemLabel">
               <a-input class="box-input"
-                       v-model="formInline.problemLabel"
+                       v-model.trim="formInline.problemLabel"
                        :placeholder="$t('PleaseEnter')+$t('problemLabel')"/>
             </a-form-model-item>
           </div>
@@ -34,6 +34,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="chargePersonIdName">
               <PersonnelSelection
+                :isSingleChoice="true"
                 :query="{db_field_name:'chargePersonId',db_field_txt:$t('personCharge')}"
                 :personneQuery="formInline"
                 @change="PersonnelSelectionChange"
@@ -75,8 +76,8 @@
               trigger: 'blur'
             },
             {
-              max: 100,
-              message: this.$t('problemLabel') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('problemLabel') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ]
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
index ef66a9780..54bc7a3cd 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
@@ -21,7 +21,7 @@
               <a-form-model-item class="itemModel" prop="lableName">
                 <a-input class="box-input"
                          :disabled="disabled"
-                         v-model="formInline.lableName"
+                         v-model.trim="formInline.lableName"
                          :placeholder="$t('PleaseEnter')+$t('LabelName')"/>
               </a-form-model-item>
             </div>
@@ -77,6 +77,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="orderNum">
                 <a-input-number class="box-input"
+                                :max="9999"
+                                :min="0"
                                 :disabled="disabled"
                                 v-model="formInline.orderNum"
                                 :placeholder="$t('PleaseEnter')+$t('DisplayOrder')"/>
@@ -94,7 +96,7 @@
               <a-form-model-item class="itemModel" prop="relevantUrl">
                 <a-input class="box-input"
                          :disabled="disabled"
-                         v-model="formInline.relevantUrl"
+                         v-model.trim="formInline.relevantUrl"
                          :placeholder="$t('PleaseEnter')+$t('associatedWebsite')"/>
               </a-form-model-item>
             </div>
@@ -111,7 +113,7 @@
                 <a-textarea
                   :placeholder="$t('PleaseEnter')+$t('describe')"
                   :disabled="disabled"
-                  v-model="formInline.description" :rows="4"/>
+                  v-model.trim="formInline.description" :rows="4"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -190,8 +192,8 @@
           ],
           description: [
             {
-              max: 300,
-              message: this.$t('describe') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 500,
+              message: this.$t('describe') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
               trigger: 'blur'
             }
           ]
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 9b6df4de4..89f8433f7 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -134,6 +134,7 @@
       },
       ResetSearch() {
         this.searchStr = ''
+        this.selectedTags = []
         this.pageNo = 1
         this.getList()
       },
diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue
index f25f17751..7d27bc8fd 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue
@@ -79,13 +79,13 @@
                 <a-textarea
                   :placeholder="$t('PleaseEnter')+title"
                   :disabled="false"
-                  v-model="formInline.replyContent" :rows="4"/>
+                  v-model.trim="formInline.replyContent" :rows="4"/>
               </a-form-model-item>
               <a-form-model-item v-else-if="title == $t('publishComment')" class="itemModel" :prop="'commentContent'">
                 <a-textarea
                   :placeholder="$t('PleaseEnter')+title"
                   :disabled="false"
-                  v-model="formInline.commentContent" :rows="4"/>
+                  v-model.trim="formInline.commentContent" :rows="4"/>
               </a-form-model-item>
             </div>
           </a-col>
diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
index dec21a79b..0d49d4763 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
@@ -187,6 +187,7 @@
       } else {
         this.isDisplay = true
       }
+      document.title = this.$t('DocumentComparison') + ' - ' + this.$t('comparisonResults')
       this.language = localStorage.getItem('language') || ''
       this.getData()
     },
@@ -207,7 +208,7 @@
           includeComments: fullCheckbox,
           infoId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + '.xls', query, this.Deselect)
+        downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + this.$t('comparisonResults') + '.xls', query, this.Deselect)
       },
       Deselect() {
         this.checkboxList = []
diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
index dfe2eeb53..d424e3ab7 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
@@ -182,6 +182,7 @@
     },
     mounted() {
       this.getData()
+      document.title = this.$t('DocumentComparison') + ' - ' + this.$t('edit')
     },
     methods: {
       Fallback() {
@@ -326,12 +327,14 @@
           if (detailRightColor && detailRightColor.length > 0) {
             detailRightColor[0].classList.remove('detail-content-content-right-data-color-right')
           }
-          let detailContent = document.getElementsByClassName('detail-content-content-right-right-top')
-          let detailRight = document.getElementsByClassName('detail-content-content-right-data-right')
-          this.dataRight = this.resultData.textRight[item.targetStand]
-          if (detailRight && detailRight.length > 0) {
-            detailRight[item.targetStand].classList.add('detail-content-content-right-data-color-right')
-            detailContent[0].scrollTop = detailRight[item.targetStand].offsetTop - 150
+          if (item.targetStand && item.targetStand >= 0) {
+            let detailContent = document.getElementsByClassName('detail-content-content-right-right-top')
+            let detailRight = document.getElementsByClassName('detail-content-content-right-data-right')
+            this.dataRight = this.resultData.textRight[item.targetStand]
+            if (detailRight && detailRight.length > 0) {
+              detailRight[item.targetStand].classList.add('detail-content-content-right-data-color-right')
+              detailContent[0].scrollTop = detailRight[item.targetStand].offsetTop - 150
+            }
           }
         }
       },
@@ -354,12 +357,14 @@
           if (detailLeftColor && detailLeftColor.length > 0) {
             detailLeftColor[0].classList.remove('detail-content-content-right-data-color')
           }
-          this.dataLeft = this.resultData.textLeft[item.targetStand]
-          let detailContent = document.getElementsByClassName('detail-content-content-right-top')
-          let detailLeft = document.getElementsByClassName('detail-content-content-right-data')
-          if (detailLeft && detailLeft.length > 0) {
-            detailLeft[item.targetStand].classList.add('detail-content-content-right-data-color')
-            detailContent[0].scrollTop = detailLeft[item.targetStand].offsetTop - 150
+          if (item.targetStand && item.targetStand >= 0) {
+            this.dataLeft = this.resultData.textLeft[item.targetStand]
+            let detailContent = document.getElementsByClassName('detail-content-content-right-top')
+            let detailLeft = document.getElementsByClassName('detail-content-content-right-data')
+            if (detailLeft && detailLeft.length > 0 && item.targetStand >= 0) {
+              detailLeft[item.targetStand].classList.add('detail-content-content-right-data-color')
+              detailContent[0].scrollTop = detailLeft[item.targetStand].offsetTop - 150
+            }
           }
         }
       },
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
index 8a7a8ce2c..5c02c7ce8 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
@@ -242,6 +242,7 @@
     mounted() {
       this.getListLeft()
       this.getListRight()
+      document.title = this.$t('DocumentComparison') + ' - ' + this.$t('initiateComparison')
     },
     methods: {
       Fallback() {
@@ -348,7 +349,7 @@
         let query = {
           pageNo: this.pageNoLeft,
           pageSize: this.pageSizeLeft,
-          fileId:'1',
+          fileId: '1',
           ...queryParam
         }
         this.loadingLeft = true
@@ -372,7 +373,7 @@
         let query = {
           pageNo: this.pageNoRight,
           pageSize: this.pageSizeRight,
-          fileId:'1',
+          fileId: '1',
           ...queryParam
         }
         this.loadingRight = true