bugfix

src/jmapNew/utils/JTriangle.js

@@ -16,6 +16,7 @@ JTriangle.prototype = {
     init (beg, end) {
         this.beg = beg;
         this.end = end;
+        if(!this.beg) debugger
         this.abspowx = Math.pow(this.end.x - this.beg.x, 2);
         this.abspowy = Math.pow(this.end.y - this.beg.y, 2);
         this.abspowz = this.abspowx + this.abspowy;

src/store/modules/map.js

@@ -750,12 +750,13 @@ const map = {
         showConfig = Vue.prototype.$jlmap.getShowConfig()
       }
       Object.keys(data).forEach(key => {
-        state.map[key] = deepAssign(state.map[key] || {}, data[key])
+        state.map[key] = [...state.map[key] , ...data[key]]
       })
       const parser = parserFactory(ParserType.Graph.value)
       state.mapDevice = parser.parser(state.map, state.map.skinVO.code, showConfig)
       Vue.prototype.$jlmap && Vue.prototype.$jlmap.setMapDevice(state.mapDevice)
       Vue.prototype.$jlmap && Vue.prototype.$jlmap.$painter.repaint(state.mapDevice)
+      Vue.prototype.$jlmap && Vue.prototype.$jlmap.setDefaultState()
     },
     updateMapDevice: (state, list) => {
       list.forEach(elem => {

src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue

@@ -222,7 +222,6 @@ export default {
     },
     generateExportData() {
       let res = {}
-      debugger
       this.modelList.forEach(item => {
         res[`${item.type.toLowerCase()}List`] = [...item.list.map(_ => _.code), ...(item.logicSectionList || []).map(_ => _.code)]
       })
@@ -237,6 +236,7 @@ export default {
       for (let key in res) {
         if (key !== 'switchList') res[key] = this.$store.state.map.map[key].filter(model => res[key].includes(model.code))
       }
+      debugger
       return res
     },
     clearList() {