From 07e8d76398c57c735472fe54227fd61aeda474c0 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 24 Nov 2021 10:49:42 +0800
Subject: [PATCH] commit

---
 src/pages/localTool/standContrast/index.vue   |  8 +++++
 .../standContrast/pages/contrastDetails.vue   | 31 +++++++++++++------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue
index 43ef1da5b..b8a4545bd 100644
--- a/src/pages/localTool/standContrast/index.vue
+++ b/src/pages/localTool/standContrast/index.vue
@@ -92,6 +92,14 @@
                 label="比对类型"
                 align="center">
               </el-table-column>
+              <el-table-column
+                      prop="compareStatus"
+                      label="比对状态"
+                      align="center">
+<!--                <template slot-scope="scope">-->
+<!--                  -->
+<!--                </template>-->
+              </el-table-column>
               <el-table-column
                 prop="createTime"
                 label="比对时间"
diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue
index 8e6d60755..49fd02d36 100644
--- a/src/pages/localTool/standContrast/pages/contrastDetails.vue
+++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue
@@ -362,15 +362,28 @@ export default {
           type: 'warning'
         })
       }
-      this.$router.push({
-        name: 'TextComparison',
-        query: {
-          infoIdLeft: this.selectedSplitStandList[0].id,
-          infoIdRight: this.selectedSplitStandList2[0].id,
-          rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]),
-          rowDataRight: JSON.stringify(this.selectedSplitStandList2[0])
-        }
-      })
+        return new Promise((resolve, reject) => {
+            this.spinShow = true
+            this.$http.post('lawss/sarStandCompareHis/fullTextComparison', {
+                leftStandard:this.selectedSplitStandList[0].id,
+                rightStandard: this.selectedSplitStandList2[0].id,
+            }, {
+                _this: this
+            }, res => {
+                this.spinShow = false
+                this.$message.warning(res.data)
+            }, e => {
+            })
+        })
+      // this.$router.push({
+      //   name: 'TextComparison',
+      //   query: {
+      //     infoIdLeft: this.selectedSplitStandList[0].id,
+      //     infoIdRight: this.selectedSplitStandList2[0].id,
+      //     rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]),
+      //     rowDataRight: JSON.stringify(this.selectedSplitStandList2[0])
+      //   }
+      // })
     },
     addFileStandPageChange (page) {
       this.addFilePage = page