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

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

@@ -163,6 +163,11 @@ export default {
       this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
         _this: this
       }, res => {
+        if(res.data.error === '比对数据已删除'){
+          this.spinShow = false
+          this.$message.error('比对数据已删除')
+          return
+        }else {
           this.oldLeftId = '#left_' + this.saveItemId
           this.oldRightId = '#right_' + this.saveItemIdRight
           this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html()
@@ -181,12 +186,11 @@ export default {
           treeNodeLeft.id = this.saveLeftId
           const treeNodeRight = {}
           treeNodeRight.id = this.saveRightId
-          console.log(treeNodeLeft)
-          console.log(treeNodeRight)
           this.handleLeftTreeClick("domesticTree1",treeNodeLeft)
           this.handleRightTreeClick("domesticTree2",treeNodeRight)
           // this.resultModal = true
           this.spinShow = false
+        }
       }, e => {
       })
     },