set

pages/processManage/setProcess/index.vue

@@ -693,15 +693,9 @@ export default {
     }
   },
   created() {
-<<<<<<< HEAD
-    this.treeHeight = window.innerHeight - 100
-    this.tableHeight = window.innerHeight - 240
-    this.newColumn = this.historycolumn;
-=======
     this.treeHeight = window.innerHeight - 140
     this.tableHeight = window.innerHeight - 230
     this.newColumn = this.historycolumn
->>>>>>> 031cff9011a771c8d2267c38bbf2503998d55b60
     this.column = this.newColumn
     this.loaddata('')
   },