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

src/pages/localTool/standContrast/pages/textComparison.vue

@@ -145,7 +145,7 @@ export default {
     }
   },
   methods: {
-    comparisonClick () {
+    comparisonClick (flag) {
       if (this.saveItemId === '' && this.saveItemIdRight === '') {
         return this.$Message.warning('请选择比对的条款内容')
       }
@@ -155,7 +155,8 @@ export default {
       this.spinShow = true
       let itemsEoPage = {
         oldItemId: this.saveItemId,
-        newItemId: this.saveItemIdRight
+        newItemId: this.saveItemIdRight,
+        flag: flag
       }
       this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
         _this: this
@@ -164,8 +165,8 @@ export default {
         this.oldRightId = '#right_' + this.saveItemIdRight
         this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html()
         this.oldRightContent = $('#itemsRightText_' + this.saveItemIdRight).html()
-        $('#left_' + this.saveItemId).find('#itemsLeftText_' + this.saveItemId).html(res.data.leftString)
-        $('#right_' + this.saveItemIdRight).find('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString)
+        $('#itemsLeftText_' + this.saveItemId).html(res.data.leftString)
+        $('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString)
         this.text = res.data.similarityDegree
         if (parseFloat(res.data.similarityDegree) >= parseFloat('75%') && parseFloat(res.data.similarityDegree) !== parseFloat('100%')) {
           this.textcontent = '相似'
@@ -299,7 +300,7 @@ export default {
           scrollTop: scrollToContainer.offset().top - mainContainer.offset().top + mainContainer.scrollTop()
         })// 2秒滑动到指定位置
       }
-      this.comparisonClick()
+      this.comparisonClick(flag)
     },
     // 返回
     back () {