xy-map 1.1.66 → 1.1.68

package/package.json

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

package/xy-map.common.js

@@ -161,7 +161,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".mapboxgl-ctrl-attrib{display:none}.ma
 
 /***/ }),
 
-/***/ 8027:
+/***/ 7328:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -175,7 +175,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, ":-webkit-full-screen .d[data-v-0169c56a]{color:red}:fullscreen .d[data-v-0169c56a]{color:red}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ":-webkit-full-screen .d[data-v-7e84ad1e]{color:red}:fullscreen .d[data-v-7e84ad1e]{color:red}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -224,7 +224,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 9660:
+/***/ 9443:
 /***/ (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-3d9274c6]{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-3d9274c6]{cursor:pointer}.right-fixed[data-v-3d9274c6]{position:absolute;right:0;top:0;margin:15px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-5ba377c3]{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-5ba377c3]{cursor:pointer}.right-fixed[data-v-5ba377c3]{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
 
 /***/ }),
 
-/***/ 9958:
+/***/ 4619:
 /***/ (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-28ba91f0]{position:relative}.upload input[data-v-28ba91f0]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-ccd339a4]{position:relative}.upload input[data-v-ccd339a4]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42843,19 +42843,19 @@ var update = add("1bac846c", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 410:
+/***/ 4171:
 /***/ (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__(8027);
+var content = __webpack_require__(7328);
 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("858e1fba", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("73d0d3fa", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -42891,19 +42891,19 @@ var update = add("4a7b31d4", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3232:
+/***/ 854:
 /***/ (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__(9660);
+var content = __webpack_require__(9443);
 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("e0289fe4", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("8ef51d4e", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -42923,19 +42923,19 @@ var update = add("44d9d48a", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 8823:
+/***/ 7248:
 /***/ (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__(9958);
+var content = __webpack_require__(4619);
 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("f0cdef6a", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("117f2b6c", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -120332,8 +120332,8 @@ var mapLoad_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapLoad = (mapLoad_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/components/mapFullScreen.vue?vue&type=template&id=0169c56a&scoped=true&
-var mapFullScreenvue_type_template_id_0169c56a_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/components/mapFullScreen.vue?vue&type=template&id=7e84ad1e&scoped=true&
+var mapFullScreenvue_type_template_id_7e84ad1e_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('span', [_vm.isSlot ? _c('span', {
@@ -120354,7 +120354,7 @@ var mapFullScreenvue_type_template_id_0169c56a_scoped_true_render = function ren
     staticClass: "el-icon-full-screen mr-5"
   }), _vm._v(" " + _vm._s(_vm.isFullScreen ? '退出全屏' : '全屏') + " ")])]);
 };
-var mapFullScreenvue_type_template_id_0169c56a_scoped_true_staticRenderFns = [];
+var mapFullScreenvue_type_template_id_7e84ad1e_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/components/mapFullScreen.vue?vue&type=script&lang=js&
 /* harmony default export */ var mapFullScreenvue_type_script_lang_js_ = ({
@@ -120375,6 +120375,7 @@ var mapFullScreenvue_type_template_id_0169c56a_scoped_true_staticRenderFns = [];
   },
   watch: {
     isFullScreen(val) {
+      console.log('isFullScreen', val);
       this.$emit('change', val);
     }
   },
@@ -120458,9 +120459,9 @@ var mapFullScreenvue_type_template_id_0169c56a_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/package/components/mapFullScreen.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_mapFullScreenvue_type_script_lang_js_ = (mapFullScreenvue_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/components/mapFullScreen.vue?vue&type=style&index=0&id=0169c56a&prod&lang=scss&scoped=true&
-var mapFullScreenvue_type_style_index_0_id_0169c56a_prod_lang_scss_scoped_true_ = __webpack_require__(410);
-;// CONCATENATED MODULE: ./src/package/components/mapFullScreen.vue?vue&type=style&index=0&id=0169c56a&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/components/mapFullScreen.vue?vue&type=style&index=0&id=7e84ad1e&prod&lang=scss&scoped=true&
+var mapFullScreenvue_type_style_index_0_id_7e84ad1e_prod_lang_scss_scoped_true_ = __webpack_require__(4171);
+;// CONCATENATED MODULE: ./src/package/components/mapFullScreen.vue?vue&type=style&index=0&id=7e84ad1e&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/components/mapFullScreen.vue
 
@@ -120473,11 +120474,11 @@ var mapFullScreenvue_type_style_index_0_id_0169c56a_prod_lang_scss_scoped_true_
 
 var mapFullScreen_component = normalizeComponent(
   components_mapFullScreenvue_type_script_lang_js_,
-  mapFullScreenvue_type_template_id_0169c56a_scoped_true_render,
-  mapFullScreenvue_type_template_id_0169c56a_scoped_true_staticRenderFns,
+  mapFullScreenvue_type_template_id_7e84ad1e_scoped_true_render,
+  mapFullScreenvue_type_template_id_7e84ad1e_scoped_true_staticRenderFns,
   false,
   null,
-  "0169c56a",
+  "7e84ad1e",
   null
   
 )
@@ -120570,8 +120571,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=3d9274c6&scoped=true&
-var drawvue_type_template_id_3d9274c6_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=5ba377c3&scoped=true&
+var drawvue_type_template_id_5ba377c3_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -120699,7 +120700,8 @@ var drawvue_type_template_id_3d9274c6_scoped_true_render = function render() {
       "encoding": _vm.encoding
     },
     on: {
-      "upload": _vm.getUpload
+      "upload": _vm.getUpload,
+      "uploadName": _vm.getUploadName
     }
   }) : _vm._e(), _vm.uploadJson ? _c('json-file', {
     attrs: {
@@ -120713,7 +120715,7 @@ var drawvue_type_template_id_3d9274c6_scoped_true_render = function render() {
     staticClass: "right-fixed"
   }, [_vm._t("right-fixed")], 2)]);
 };
-var drawvue_type_template_id_3d9274c6_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_5ba377c3_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(6957);
@@ -120938,8 +120940,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=28ba91f0&scoped=true&
-var shpFilevue_type_template_id_28ba91f0_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=ccd339a4&scoped=true&
+var shpFilevue_type_template_id_ccd339a4_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -120960,7 +120962,7 @@ var shpFilevue_type_template_id_28ba91f0_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_28ba91f0_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_ccd339a4_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&
 
@@ -120980,6 +120982,11 @@ const shapeFile = __webpack_require__(1393);
       default: 'utf-8'
     }
   },
+  data() {
+    return {
+      fileName: ''
+    };
+  },
   methods: {
     /**
      * 将文件读取为 ArrayBuffer
@@ -121014,6 +121021,10 @@ const shapeFile = __webpack_require__(1393);
         return false;
       }
       this.$emit('upload', json);
+      this.$emit('uploadName', {
+        json,
+        fileName: this.fileName
+      });
       return true;
     },
     /**
@@ -121031,6 +121042,9 @@ const shapeFile = __webpack_require__(1393);
       if (!shpFile) {
         return this.$message.error('请上传.shp文件');
       }
+
+      //获取文件名称
+      this.fileName = shpFile.name.split('.')[0];
       if (this.requireDbf && !dbfFile) {
         return this.$message.error('请同时上传.dbf文件以获取属性数据');
       }
@@ -121046,9 +121060,11 @@ const shapeFile = __webpack_require__(1393);
      * @param {File} dbfFile - DBF 文件对象
      */
     readWithDbf(shpFile, dbfFile) {
-      Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(([shpBuffer, dbfBuffer]) => {
+      Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(async ([shpBuffer, dbfBuffer]) => {
+        let encoding = this.detectEncoding(dbfBuffer);
+        console.log('encoding', encoding, this.encoding);
         shapeFile.open(shpBuffer, dbfBuffer, {
-          encoding: this.encoding
+          encoding: encoding || this.encoding
         }).then(source => {
           const features = [];
           const read = () => {
@@ -121085,14 +121101,33 @@ const shapeFile = __webpack_require__(1393);
           this.$message.error('读取文件失败，请检查文件格式是否正确');
         });
       });
+    },
+    /**
+    * 读取文件编码格式
+    */
+    detectEncoding(dbfBuffer) {
+      //方法一： 读取 LDID（第 29 字节）
+      const ldid = new Uint8Array(dbfBuffer)[29];
+      const ldidMap = {
+        0x57: 'gb2312',
+        // 简体中文
+        0xc8: 'latin1',
+        // Windows-1252
+        0x4d: 'utf-8',
+        // UTF-8
+        0x03: 'cp437' // OEM
+      };
+
+      let encoding = ldidMap[ldid];
+      return encoding;
     }
   }
 });
 ;// 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=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&
+// 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=ccd339a4&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_ccd339a4_prod_lang_scss_scoped_true_ = __webpack_require__(7248);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=ccd339a4&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
 
@@ -121105,11 +121140,11 @@ var shpFilevue_type_style_index_0_id_28ba91f0_prod_lang_scss_scoped_true_ = __we
 
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_28ba91f0_scoped_true_render,
-  shpFilevue_type_template_id_28ba91f0_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_ccd339a4_scoped_true_render,
+  shpFilevue_type_template_id_ccd339a4_scoped_true_staticRenderFns,
   false,
   null,
-  "28ba91f0",
+  "ccd339a4",
   null
   
 )
@@ -121472,16 +121507,20 @@ var shpFile_component = normalizeComponent(
     getUpload(json) {
       this.$emit('getUpload', json);
     },
+    getUploadName(data) {
+      this.$emit('getUploadName', data);
+    },
     changeFullscreen(value) {
+      console.log('全屏状态', value);
       this.$emit('changeFullscreen', value);
     }
   }
 });
 ;// 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=3d9274c6&prod&lang=scss&scoped=true&
-var drawvue_type_style_index_0_id_3d9274c6_prod_lang_scss_scoped_true_ = __webpack_require__(3232);
-;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=3d9274c6&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=5ba377c3&prod&lang=scss&scoped=true&
+var drawvue_type_style_index_0_id_5ba377c3_prod_lang_scss_scoped_true_ = __webpack_require__(854);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=5ba377c3&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -121494,18 +121533,18 @@ var drawvue_type_style_index_0_id_3d9274c6_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_3d9274c6_scoped_true_render,
-  drawvue_type_template_id_3d9274c6_scoped_true_staticRenderFns,
+  drawvue_type_template_id_5ba377c3_scoped_true_render,
+  drawvue_type_template_id_5ba377c3_scoped_true_staticRenderFns,
   false,
   null,
-  "3d9274c6",
+  "5ba377c3",
   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=25f538cc&
-var pointvue_type_template_id_25f538cc_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=6b5be810&
+var pointvue_type_template_id_6b5be810_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121531,6 +121570,7 @@ var pointvue_type_template_id_25f538cc_render = function render() {
       "end": _vm.drawUpdate,
       "delete": _vm.drawUpdate,
       "getUpload": _vm.getUpload,
+      "getUploadName": _vm.getUploadName,
       "clear": _vm.clear
     }
   }, 'draw-tools', _vm.$attrs, false), [_c('div', {
@@ -121561,7 +121601,7 @@ var pointvue_type_template_id_25f538cc_render = function render() {
     staticClass: "margin-top font-12"
   }, [_vm._v(" 地址：" + _vm._s(_vm.address.formattedAddress) + " ")]) : _vm._e()])])], 1);
 };
-var pointvue_type_template_id_25f538cc_staticRenderFns = [];
+var pointvue_type_template_id_6b5be810_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&
 
@@ -121696,6 +121736,9 @@ var pointvue_type_template_id_25f538cc_staticRenderFns = [];
     },
     getUpload(json) {
       this.$emit('getUpload', json);
+    },
+    getUploadName(data) {
+      this.$emit('getUploadName', data);
     }
   }
 });
@@ -121711,8 +121754,8 @@ var pointvue_type_template_id_25f538cc_staticRenderFns = [];
 ;
 var point_component = normalizeComponent(
   draw_pointvue_type_script_lang_js_,
-  pointvue_type_template_id_25f538cc_render,
-  pointvue_type_template_id_25f538cc_staticRenderFns,
+  pointvue_type_template_id_6b5be810_render,
+  pointvue_type_template_id_6b5be810_staticRenderFns,
   false,
   null,
   null,
@@ -121721,8 +121764,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var point = (point_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/line.vue?vue&type=template&id=1e1a2862&
-var linevue_type_template_id_1e1a2862_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/line.vue?vue&type=template&id=2d783e30&
+var linevue_type_template_id_2d783e30_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121747,7 +121790,8 @@ var linevue_type_template_id_1e1a2862_render = function render() {
       "end": _vm.drawUpdate,
       "delete": _vm.drawUpdate,
       "clear": _vm.clear,
-      "getUpload": _vm.getUpload
+      "getUpload": _vm.getUpload,
+      "getUploadName": _vm.getUploadName
     }
   }, 'draw-tools', _vm.$attrs, false), [_c('div', {
     staticClass: "mt-15 flex flex-wrap",
@@ -121777,7 +121821,7 @@ var linevue_type_template_id_1e1a2862_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_1e1a2862_staticRenderFns = [];
+var linevue_type_template_id_2d783e30_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/line.vue?vue&type=script&lang=js&
 
@@ -121909,6 +121953,9 @@ var linevue_type_template_id_1e1a2862_staticRenderFns = [];
       this.$refs.draw.clear(); // 先清空画布
       this.drawUpdate(shp, true);
       this.edit();
+    },
+    getUploadName(data) {
+      this.$emit('getUploadName', data);
     }
   }
 });
@@ -121924,8 +121971,8 @@ var linevue_type_template_id_1e1a2862_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_1e1a2862_render,
-  linevue_type_template_id_1e1a2862_staticRenderFns,
+  linevue_type_template_id_2d783e30_render,
+  linevue_type_template_id_2d783e30_staticRenderFns,
   false,
   null,
   null,
@@ -121934,8 +121981,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_line = (line_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/polygon.vue?vue&type=template&id=4c27d54b&
-var polygonvue_type_template_id_4c27d54b_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/polygon.vue?vue&type=template&id=73eef5a9&
+var polygonvue_type_template_id_73eef5a9_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121960,7 +122007,8 @@ var polygonvue_type_template_id_4c27d54b_render = function render() {
       "end": _vm.drawUpdate,
       "delete": _vm.drawUpdate,
       "clear": _vm.clear,
-      "getUpload": _vm.getUpload
+      "getUpload": _vm.getUpload,
+      "getUploadName": _vm.getUploadName
     }
   }, 'draw-tools', _vm.$attrs, false), [_c('div', {
     staticClass: "mt-15 flex flex-wrap",
@@ -121990,7 +122038,7 @@ var polygonvue_type_template_id_4c27d54b_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_4c27d54b_staticRenderFns = [];
+var polygonvue_type_template_id_73eef5a9_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/polygon.vue?vue&type=script&lang=js&
 
@@ -122121,6 +122169,9 @@ var polygonvue_type_template_id_4c27d54b_staticRenderFns = [];
       this.$refs.draw.clear(); // 先清空画布
       this.drawUpdate(shp, true);
       this.edit();
+    },
+    getUploadName(data) {
+      this.$emit('getUploadName', data);
     }
   }
 });
@@ -122136,8 +122187,8 @@ var polygonvue_type_template_id_4c27d54b_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_4c27d54b_render,
-  polygonvue_type_template_id_4c27d54b_staticRenderFns,
+  polygonvue_type_template_id_73eef5a9_render,
+  polygonvue_type_template_id_73eef5a9_staticRenderFns,
   false,
   null,
   null,