Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue

@@ -9,6 +9,16 @@
           <span> {{$t('comparisonResults')}}</span>
         </div>
         <div class="doc-detail-right">
+          <div @click="viewConsistentAssessmentClick" class="operator-text-text"
+               :title="$t('viewConsistentAssessment')">
+            <a-icon type="eye"/>
+            {{$t('viewConsistentAssessment')}}
+          </div>
+          <div @click="viewAllClick" class="operator-text-text"
+               :title="$t('viewAll')">
+            <a-icon type="eye"/>
+            {{$t('viewAll')}}
+          </div>
           <div @click="exportComparisonReportClick" class="operator-text-text"
                :title="$t('exportComparisonReport')">
             <a-icon type="export"/>
@@ -65,7 +75,8 @@
                     </div>
                     <div class="detail-content-left-button" v-html="item.itemsTextRight"></div>
                   </div>
-                  <div class="detail-content-bottom" :class="{'detail-content-bottom-color':checkboxList.join(',').includes(item.id)}">
+                  <div class="detail-content-bottom"
+                       :class="{'detail-content-bottom-color':checkboxList.join(',').includes(item.id)}">
                     <div class="detail-content-bottom-left"
                          :class="{'detail-content-bottom-left-text':language == 'en-us' ? true:false}"
                          :title="$t('comparisonDifferenceComment')">
@@ -176,6 +187,7 @@
         isDisplay: false,
         fullCheckbox: false,
         resultData: {},
+        comment: '',
         language: '',
         url: {
           exportData: '/compare/sarFileCompareItemComment/exportResXls'
@@ -207,7 +219,8 @@
         let query = {
           selectIds: checkboxList.join(','),
           includeComments: fullCheckbox,
-          infoId: this.$route.query.id
+          infoId: this.$route.query.id,
+          comment: this.comment
         }
         downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + this.$t('comparisonResults') + '.xls', query, this.Deselect)
       },
@@ -217,10 +230,19 @@
         this.indeterminate = false
         this.checkAll = false
       },
+      viewConsistentAssessmentClick() {
+        this.comment = '一致'
+        this.getData()
+      },
+      viewAllClick() {
+        this.comment = ''
+        this.getData()
+      },
       getData() {
         let query = {
           id: this.$route.query.id,
-          infoId: this.$route.query.id
+          infoId: this.$route.query.id,
+          comment: this.comment
         }
         this.loading = true
         getAction('/compare/sarFileCompareItemComment/queryCompareResult', query).then((res) => {
@@ -536,7 +558,7 @@
 
   .detail-content-content-text-color {
     border: 1px solid #00B3BE;
-    background: rgba(0,179,190,0.0300);
+    background: rgba(0, 179, 190, 0.0300);
   }
 
   .detail-content-left {
@@ -577,9 +599,11 @@
     border-radius: 4px;
     float: left;
   }
-  .detail-content-bottom-color{
-    background: rgba(0,179,190,0.0300);
+
+  .detail-content-bottom-color {
+    background: rgba(0, 179, 190, 0.0300);
   }
+
   .detail-content-bottom-left {
     width: 115px;
     font-size: 14px;