diff --git a/src/store/modules/menuoperation.js b/src/store/modules/menuoperation.js index bc12b8df9..0c9568aff 100644 --- a/src/store/modules/menuoperation.js +++ b/src/store/modules/menuoperation.js @@ -76,6 +76,7 @@ const menuOperation = { setMenu: (state, menu) => { state.menu = menu; state.menuCount += 1; + console.log(state.menuCount); }, setMenuParam: (state, param) => { state.menuParam = param; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 79d1c6346..1e9afea51 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,11 +3,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/views/designUser/mapmanage/operateMenu.vue b/src/views/designUser/mapmanage/operateMenu.vue index 29f0559b8..3837d2503 100644 --- a/src/views/designUser/mapmanage/operateMenu.vue +++ b/src/views/designUser/mapmanage/operateMenu.vue @@ -92,6 +92,7 @@ export default { }, watch: { '$store.state.menuOperation.menuCount': function (val) { + console.log(val); if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Map)) { this.menu = [...this.menuMap]; if (this.hasRelease) { diff --git a/src/views/newMap/newDesignUser/demonList.vue b/src/views/newMap/newDesignUser/demonList.vue index d5ee13442..9360362c4 100644 --- a/src/views/newMap/newDesignUser/demonList.vue +++ b/src/views/newMap/newDesignUser/demonList.vue @@ -20,6 +20,14 @@ {{ $t('map.newConstruction') }} + @@ -28,9 +36,13 @@ import { DeviceMenu } from '@/scripts/ConstDic'; import { postBuildMapImport, listMap } from '@/api/jmap/mapdraft'; import { UrlConfig } from '@/router/index'; import { removeSessionStorage } from '@/utils/auth'; +import MapOperateMenu from './mapmanage/operateMenu'; export default { name: 'UserMapList', + components: { + MapOperateMenu + }, props: { width: { type: Number, @@ -134,6 +146,9 @@ export default { this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu }); } }, + jlmap3d() { + this.$router.push({ path: '/design/jlmap3d/edit', query: { mapid: this.editModel.id } }); + }, importf() { const loading = this.$loading({ lock: true, diff --git a/src/views/newMap/newMapdraft/mapoperate/switch.vue b/src/views/newMap/newMapdraft/mapoperate/switch.vue index c6239ea9c..f3b0e4eb3 100644 --- a/src/views/newMap/newMapdraft/mapoperate/switch.vue +++ b/src/views/newMap/newMapdraft/mapoperate/switch.vue @@ -480,6 +480,7 @@ export default { const switchList = [...this.switchList, ...list]; if (list && list.length && sectionLists && sectionLists.length) { const sectionList = []; + const addSectionList = []; list.forEach(elem => { const sectionb = this.findSectionData(sectionLists, elem.sectionBCode); const sectiona = this.findSectionData(sectionLists, elem.sectionACode); @@ -488,9 +489,10 @@ export default { if (!parentSectionModel) { // 找不到父元素删除 let uid; if (!elem['uid']) { - uid = getUID('T', [...this.sectionList, ...sectionList]); + uid = getUID('T', [...this.sectionList, ...addSectionList]); elem['uid'] = uid; } + addSectionList.push({ code: elem.uid }); sectiona.parentCode = elem['uid']; sectionb.parentCode = elem['uid']; sectionc.parentCode = elem['uid'];