1fdac3f5 by 杨威

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

# Conflicts:
#	src/views/zd/zddcb/index.vue
2 parents 20924348 3f1fb4a7
...@@ -241,7 +241,6 @@ export default { ...@@ -241,7 +241,6 @@ export default {
241 methods: { 241 methods: {
242 // 重置 242 // 重置
243 reset(){ 243 reset(){
244 debugger
245 if(this.$refs['ruleForm']){ 244 if(this.$refs['ruleForm']){
246 this.$refs['ruleForm'].resetFields(); 245 this.$refs['ruleForm'].resetFields();
247 } 246 }
......
...@@ -349,7 +349,6 @@ ...@@ -349,7 +349,6 @@
349 <script> 349 <script>
350 import Qlr from "../../../components/formMenu/qlr"; 350 import Qlr from "../../../components/formMenu/qlr";
351 import Qlxz from "../../../components/formMenu/qlxz"; 351 import Qlxz from "../../../components/formMenu/qlxz";
352 //import {submit} from "../../../api/common"
353 import geoUtils from "@components/lineTree/tx/js/geoUtils"; 352 import geoUtils from "@components/lineTree/tx/js/geoUtils";
354 import { 353 import {
355 getAllList, 354 getAllList,
......