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

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="比对时间"

src/pages/localTool/standContrast/pages/contrastDetails.vue

@@ -362,15 +362,28 @@ export default {
           type: 'warning'
         })
       }
-      this.$router.push({
+        return new Promise((resolve, reject) => {
-        name: 'TextComparison',
+            this.spinShow = true
-        query: {
+            this.$http.post('lawss/sarStandCompareHis/fullTextComparison', {
-          infoIdLeft: this.selectedSplitStandList[0].id,
+                leftStandard:this.selectedSplitStandList[0].id,
-          infoIdRight: this.selectedSplitStandList2[0].id,
+                rightStandard: this.selectedSplitStandList2[0].id,
-          rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]),
+            }, {
-          rowDataRight: JSON.stringify(this.selectedSplitStandList2[0])
+                _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