8e704487 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents db4c81ed 13155d1f
...@@ -73,6 +73,7 @@ export default { ...@@ -73,6 +73,7 @@ export default {
73 height: calc(100% - 50px); 73 height: calc(100% - 50px);
74 /deep/.el-tabs__content{ 74 /deep/.el-tabs__content{
75 height: 100%; 75 height: 100%;
76 position: unset;
76 /deep/.el-tab-pane{ 77 /deep/.el-tab-pane{
77 height: calc(100% - 40px); 78 height: calc(100% - 40px);
78 } 79 }
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 <span>缩小</span> 38 <span>缩小</span>
39 </li> 39 </li>
40 <li @click="info"> 40 <li @click="info">
41 <i class="iconfont iconxinxi"></i> 41 <i class="iconfont iconshibie"></i>
42 <span>识别</span> 42 <span>识别</span>
43 </li> 43 </li>
44 <li @click="clear"> 44 <li @click="clear">
......
...@@ -403,7 +403,8 @@ export default { ...@@ -403,7 +403,8 @@ export default {
403 } 403 }
404 batchCommit(this.bsms).then(res=>{ 404 batchCommit(this.bsms).then(res=>{
405 if (res.success) { 405 if (res.success) {
406 Message.success("提交成功") 406 Message.success("提交成功");
407 this.getlpbData();
407 } 408 }
408 }) 409 })
409 }, 410 },
...@@ -587,7 +588,7 @@ export default { ...@@ -587,7 +588,7 @@ export default {
587 getlpbData() { 588 getlpbData() {
588 this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx); 589 this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
589 //改变楼盘表子组件的key值,重新渲染 590 //改变楼盘表子组件的key值,重新渲染
590 // this.time = new Date().getTime(); 591 this.time = new Date().getTime();
591 }, 592 },
592 //实预测装换 593 //实预测装换
593 plScYcChange() { 594 plScYcChange() {
......