Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -102,7 +102,7 @@
 		</ul>
 
     <el-dialog title="导入图形" :visible.sync="improtDialog">
-      <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
+      <import-geo  :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
     </el-dialog>
 		<!-- 添加定着物弹框 -->
 		<el-dialog title="新建" :visible.sync="dialogVisible" width="48%">

@@ -138,6 +138,10 @@ export default {
     geoInfo:{
       type:Object,
       default:null
+    },
+    timeLine:{
+      type:Number,
+      default:null
     }
   },
   mixins:[geoUtils,featureUpdate],
@@ -156,6 +160,15 @@ export default {
       }
     }
   },
+  mounted(){
+
+  },
+  watch:{
+    timeLine(newValue,oldValue){
+      this.resultDialog = false;
+      this.txtResultDialog = false;
+    }
+  },
   methods:{
     txtFileChange(file, fileList){
       var self = this;