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

@@ -69,7 +69,7 @@
 					<li @click="exportToShp">ESRI Shape</li>
 					<li @click="exportToShp">ESRI Shape</li>
 				</ul>
 				</ul>
 			</li>
 			</li>
-			<li v-show="isZD" @click="drsx">导入属性</li>
+			<li  @click="drsx">导入属性</li>
 			<li v-show="!isZD">导入楼盘</li>
 			<li v-show="!isZD">导入楼盘</li>
 			<li>重叠分析</li>
 			<li>重叠分析</li>
 			<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li>
 			<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li>

@@ -8,7 +8,7 @@
             <div class="main-button">
             <div class="main-button">
                 <el-upload
                 <el-upload
                         class="upload-demo"
                         class="upload-demo"
-                        :action="uploadUrl"
+                        action="/api/tx/excelGeo/import"
                         :data="sxdrData"
                         :data="sxdrData"
                         :on-success="uploadSuccess"
                         :on-success="uploadSuccess"
                         :show-file-list="false"
                         :show-file-list="false"
@@ -47,7 +47,6 @@
         },
         },
         data() {
         data() {
             return {
             return {
-                uploadUrl: '',
                 isVisible: false,
                 isVisible: false,
                 sxdrData: {
                 sxdrData: {
                     bsm: '',
                     bsm: '',
@@ -65,7 +64,6 @@
             },
             },
             reset() {
             reset() {
                 this.errorData = [];
                 this.errorData = [];
-                this.uploadUrl = '';
                 this.sxdrData = {bsm: ''};
                 this.sxdrData = {bsm: ''};
             },
             },
             close() {
             close() {
@@ -97,13 +95,6 @@
             },
             },
             dylx(val) {
             dylx(val) {
                 this.sxdrData.type=val;
                 this.sxdrData.type=val;
-                switch (val) {
-                    case "zd":
-                        this.uploadUrl = "/api/tx/excelGeo/import";
-                        break;
-                    default:
-                        break;
-                }
             },
             },
             bsm(val) {
             bsm(val) {
                 this.sxdrData.bsm = val;
                 this.sxdrData.bsm = val;