xy-map 1.1.61 → 1.1.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "description": "雄越地图",
   "main": "xy-map.umd.min.js",
   "scripts": {

package/xy-map.common.js

@@ -224,7 +224,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 8921:
+/***/ 1595:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -238,7 +238,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-4d022886]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-4d022886]{cursor:pointer}.right-fixed[data-v-4d022886]{position:absolute;right:0;top:0;margin:15px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-3968503f]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-3968503f]{cursor:pointer}.right-fixed[data-v-3968503f]{position:absolute;right:0;top:0;margin:15px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -266,7 +266,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-5a5f8c5d]{position:rela
 
 /***/ }),
 
-/***/ 1798:
+/***/ 9958:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -280,7 +280,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-6e60926f]{position:relative}.upload input[data-v-6e60926f]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-28ba91f0]{position:relative}.upload input[data-v-28ba91f0]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42891,19 +42891,19 @@ var update = add("4a7b31d4", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 343:
+/***/ 1373:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(8921);
+var content = __webpack_require__(1595);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(7037)/* ["default"] */ .Z)
-var update = add("531b6652", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("81d7a89c", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -42923,19 +42923,19 @@ var update = add("44d9d48a", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 1998:
+/***/ 8823:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(1798);
+var content = __webpack_require__(9958);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(7037)/* ["default"] */ .Z)
-var update = add("2766b1e0", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("f0cdef6a", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -120570,8 +120570,8 @@ var mapStyle_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapStyle = (mapStyle_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=4d022886&scoped=true&
-var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=3968503f&scoped=true&
+var drawvue_type_template_id_3968503f_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -120692,14 +120692,16 @@ var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
     staticClass: "mt-15"
   }, [_vm.uploadShp ? _c('shp-file', {
     attrs: {
-      "requireDbf": _vm.requireDbf
+      "requireDbf": _vm.requireDbf,
+      "encoding": _vm.encoding
     },
     on: {
       "upload": _vm.getUpload
     }
   }) : _vm._e(), _vm.uploadJson ? _c('json-file', {
     attrs: {
-      "requireDbf": _vm.requireDbf
+      "requireDbf": _vm.requireDbf,
+      "encoding": _vm.encoding
     },
     on: {
       "upload": _vm.getUpload
@@ -120708,7 +120710,7 @@ var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
     staticClass: "right-fixed"
   }, [_vm._t("right-fixed")], 2)]);
 };
-var drawvue_type_template_id_4d022886_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_3968503f_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(6957);
@@ -120933,8 +120935,8 @@ var jsonFile_component = normalizeComponent(
 )
 
 /* harmony default export */ var jsonFile = (jsonFile_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=6e60926f&scoped=true&
-var shpFilevue_type_template_id_6e60926f_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=28ba91f0&scoped=true&
+var shpFilevue_type_template_id_28ba91f0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -120955,7 +120957,7 @@ var shpFilevue_type_template_id_6e60926f_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_6e60926f_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_28ba91f0_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=script&lang=js&
 
@@ -120968,6 +120970,11 @@ const shapeFile = __webpack_require__(1393);
       type: Boolean,
       default: true,
       required: false
+    },
+    encoding: {
+      //编码格式
+      type: String,
+      default: 'utf-8'
     }
   },
   methods: {
@@ -121038,7 +121045,7 @@ const shapeFile = __webpack_require__(1393);
     readWithDbf(shpFile, dbfFile) {
       Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(([shpBuffer, dbfBuffer]) => {
         shapeFile.open(shpBuffer, dbfBuffer, {
-          encoding: 'gb2312'
+          encoding: this.encoding
         }).then(source => {
           const features = [];
           const read = () => {
@@ -121080,9 +121087,9 @@ const shapeFile = __webpack_require__(1393);
 });
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_shpFilevue_type_script_lang_js_ = (shpFilevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=6e60926f&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_6e60926f_prod_lang_scss_scoped_true_ = __webpack_require__(1998);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=6e60926f&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=28ba91f0&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_28ba91f0_prod_lang_scss_scoped_true_ = __webpack_require__(8823);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=28ba91f0&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
 
@@ -121095,11 +121102,11 @@ var shpFilevue_type_style_index_0_id_6e60926f_prod_lang_scss_scoped_true_ = __we
 
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_6e60926f_scoped_true_render,
-  shpFilevue_type_template_id_6e60926f_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_28ba91f0_scoped_true_render,
+  shpFilevue_type_template_id_28ba91f0_scoped_true_staticRenderFns,
   false,
   null,
-  "6e60926f",
+  "28ba91f0",
   null
   
 )
@@ -121181,6 +121188,11 @@ var shpFile_component = normalizeComponent(
       type: Boolean,
       default: false
     },
+    encoding: {
+      // dbf文件 编码格式
+      type: String,
+      default: 'utf-8'
+    },
     isAdsorb: {
       //是否可吸附
       type: Boolean,
@@ -121459,9 +121471,9 @@ var shpFile_component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
-var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpack_require__(343);
-;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=3968503f&prod&lang=scss&scoped=true&
+var drawvue_type_style_index_0_id_3968503f_prod_lang_scss_scoped_true_ = __webpack_require__(1373);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=3968503f&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -121474,18 +121486,18 @@ var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_4d022886_scoped_true_render,
-  drawvue_type_template_id_4d022886_scoped_true_staticRenderFns,
+  drawvue_type_template_id_3968503f_scoped_true_render,
+  drawvue_type_template_id_3968503f_scoped_true_staticRenderFns,
   false,
   null,
-  "4d022886",
+  "3968503f",
   null
   
 )
 
 /* harmony default export */ var package_draw = (draw_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/point.vue?vue&type=template&id=289ceaca&
-var pointvue_type_template_id_289ceaca_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/point.vue?vue&type=template&id=25f538cc&
+var pointvue_type_template_id_25f538cc_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121510,6 +121522,7 @@ var pointvue_type_template_id_289ceaca_render = function render() {
       "update": _vm.drawUpdate,
       "end": _vm.drawUpdate,
       "delete": _vm.drawUpdate,
+      "getUpload": _vm.getUpload,
       "clear": _vm.clear
     }
   }, 'draw-tools', _vm.$attrs, false), [_c('div', {
@@ -121540,7 +121553,7 @@ var pointvue_type_template_id_289ceaca_render = function render() {
     staticClass: "margin-top font-12"
   }, [_vm._v(" 地址：" + _vm._s(_vm.address.formattedAddress) + " ")]) : _vm._e()])])], 1);
 };
-var pointvue_type_template_id_289ceaca_staticRenderFns = [];
+var pointvue_type_template_id_25f538cc_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/point.vue?vue&type=script&lang=js&
 
@@ -121672,6 +121685,9 @@ var pointvue_type_template_id_289ceaca_staticRenderFns = [];
       this.geoJson = '';
       this.position = '';
       this.address = '';
+    },
+    getUpload(json) {
+      this.$emit('getUpload', json);
     }
   }
 });
@@ -121687,8 +121703,8 @@ var pointvue_type_template_id_289ceaca_staticRenderFns = [];
 ;
 var point_component = normalizeComponent(
   draw_pointvue_type_script_lang_js_,
-  pointvue_type_template_id_289ceaca_render,
-  pointvue_type_template_id_289ceaca_staticRenderFns,
+  pointvue_type_template_id_25f538cc_render,
+  pointvue_type_template_id_25f538cc_staticRenderFns,
   false,
   null,
   null,

package/xy-map.umd.js

@@ -234,7 +234,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 8185:
+/***/ 5447:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -248,7 +248,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-4d022886]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-4d022886]{cursor:pointer}.right-fixed[data-v-4d022886]{position:absolute;right:0;top:0;margin:15px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-3968503f]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-3968503f]{cursor:pointer}.right-fixed[data-v-3968503f]{position:absolute;right:0;top:0;margin:15px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -276,7 +276,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-5a5f8c5d]{position:rela
 
 /***/ }),
 
-/***/ 3686:
+/***/ 1884:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -290,7 +290,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-6e60926f]{position:relative}.upload input[data-v-6e60926f]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-28ba91f0]{position:relative}.upload input[data-v-28ba91f0]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42901,19 +42901,19 @@ var update = add("33a2ac54", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 8689:
+/***/ 2281:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(8185);
+var content = __webpack_require__(5447);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(208)/* ["default"] */ .Z)
-var update = add("75e200d2", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("3c4a739c", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -42933,19 +42933,19 @@ var update = add("469bd03b", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 346:
+/***/ 6280:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(3686);
+var content = __webpack_require__(1884);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(208)/* ["default"] */ .Z)
-var update = add("0f47e740", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("588e62cb", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -120588,8 +120588,8 @@ var mapStyle_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapStyle = (mapStyle_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=4d022886&scoped=true&
-var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=3968503f&scoped=true&
+var drawvue_type_template_id_3968503f_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -120710,14 +120710,16 @@ var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
     staticClass: "mt-15"
   }, [_vm.uploadShp ? _c('shp-file', {
     attrs: {
-      "requireDbf": _vm.requireDbf
+      "requireDbf": _vm.requireDbf,
+      "encoding": _vm.encoding
     },
     on: {
       "upload": _vm.getUpload
     }
   }) : _vm._e(), _vm.uploadJson ? _c('json-file', {
     attrs: {
-      "requireDbf": _vm.requireDbf
+      "requireDbf": _vm.requireDbf,
+      "encoding": _vm.encoding
     },
     on: {
       "upload": _vm.getUpload
@@ -120726,7 +120728,7 @@ var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
     staticClass: "right-fixed"
   }, [_vm._t("right-fixed")], 2)]);
 };
-var drawvue_type_template_id_4d022886_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_3968503f_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(5620);
@@ -120951,8 +120953,8 @@ var jsonFile_component = normalizeComponent(
 )
 
 /* harmony default export */ var jsonFile = (jsonFile_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=6e60926f&scoped=true&
-var shpFilevue_type_template_id_6e60926f_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=28ba91f0&scoped=true&
+var shpFilevue_type_template_id_28ba91f0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -120973,7 +120975,7 @@ var shpFilevue_type_template_id_6e60926f_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_6e60926f_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_28ba91f0_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=script&lang=js&
 
@@ -120986,6 +120988,11 @@ const shapeFile = __webpack_require__(4952);
       type: Boolean,
       default: true,
       required: false
+    },
+    encoding: {
+      //编码格式
+      type: String,
+      default: 'utf-8'
     }
   },
   methods: {
@@ -121056,7 +121063,7 @@ const shapeFile = __webpack_require__(4952);
     readWithDbf(shpFile, dbfFile) {
       Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(([shpBuffer, dbfBuffer]) => {
         shapeFile.open(shpBuffer, dbfBuffer, {
-          encoding: 'gb2312'
+          encoding: this.encoding
         }).then(source => {
           const features = [];
           const read = () => {
@@ -121098,9 +121105,9 @@ const shapeFile = __webpack_require__(4952);
 });
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_shpFilevue_type_script_lang_js_ = (shpFilevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=6e60926f&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_6e60926f_prod_lang_scss_scoped_true_ = __webpack_require__(346);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=6e60926f&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=28ba91f0&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_28ba91f0_prod_lang_scss_scoped_true_ = __webpack_require__(6280);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=28ba91f0&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
 
@@ -121113,11 +121120,11 @@ var shpFilevue_type_style_index_0_id_6e60926f_prod_lang_scss_scoped_true_ = __we
 
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_6e60926f_scoped_true_render,
-  shpFilevue_type_template_id_6e60926f_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_28ba91f0_scoped_true_render,
+  shpFilevue_type_template_id_28ba91f0_scoped_true_staticRenderFns,
   false,
   null,
-  "6e60926f",
+  "28ba91f0",
   null
   
 )
@@ -121199,6 +121206,11 @@ var shpFile_component = normalizeComponent(
       type: Boolean,
       default: false
     },
+    encoding: {
+      // dbf文件 编码格式
+      type: String,
+      default: 'utf-8'
+    },
     isAdsorb: {
       //是否可吸附
       type: Boolean,
@@ -121477,9 +121489,9 @@ var shpFile_component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
-var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpack_require__(8689);
-;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=3968503f&prod&lang=scss&scoped=true&
+var drawvue_type_style_index_0_id_3968503f_prod_lang_scss_scoped_true_ = __webpack_require__(2281);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=3968503f&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -121492,18 +121504,18 @@ var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_4d022886_scoped_true_render,
-  drawvue_type_template_id_4d022886_scoped_true_staticRenderFns,
+  drawvue_type_template_id_3968503f_scoped_true_render,
+  drawvue_type_template_id_3968503f_scoped_true_staticRenderFns,
   false,
   null,
-  "4d022886",
+  "3968503f",
   null
   
 )
 
 /* harmony default export */ var package_draw = (draw_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/point.vue?vue&type=template&id=289ceaca&
-var pointvue_type_template_id_289ceaca_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/point.vue?vue&type=template&id=25f538cc&
+var pointvue_type_template_id_25f538cc_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121528,6 +121540,7 @@ var pointvue_type_template_id_289ceaca_render = function render() {
       "update": _vm.drawUpdate,
       "end": _vm.drawUpdate,
       "delete": _vm.drawUpdate,
+      "getUpload": _vm.getUpload,
       "clear": _vm.clear
     }
   }, 'draw-tools', _vm.$attrs, false), [_c('div', {
@@ -121558,7 +121571,7 @@ var pointvue_type_template_id_289ceaca_render = function render() {
     staticClass: "margin-top font-12"
   }, [_vm._v(" 地址：" + _vm._s(_vm.address.formattedAddress) + " ")]) : _vm._e()])])], 1);
 };
-var pointvue_type_template_id_289ceaca_staticRenderFns = [];
+var pointvue_type_template_id_25f538cc_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/point.vue?vue&type=script&lang=js&
 
@@ -121690,6 +121703,9 @@ var pointvue_type_template_id_289ceaca_staticRenderFns = [];
       this.geoJson = '';
       this.position = '';
       this.address = '';
+    },
+    getUpload(json) {
+      this.$emit('getUpload', json);
     }
   }
 });
@@ -121705,8 +121721,8 @@ var pointvue_type_template_id_289ceaca_staticRenderFns = [];
 ;
 var point_component = normalizeComponent(
   draw_pointvue_type_script_lang_js_,
-  pointvue_type_template_id_289ceaca_render,
-  pointvue_type_template_id_289ceaca_staticRenderFns,
+  pointvue_type_template_id_25f538cc_render,
+  pointvue_type_template_id_25f538cc_staticRenderFns,
   false,
   null,
   null,