diff --git a/.env.development b/.env.development index c0924475f..907d441c5 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ NODE_ENV = 'development' # VUE_APP_BASE_API = 'https://joylink.club/jlcloud' # VUE_APP_BASE_API = 'http://192.168.3.4:9000' VUE_APP_BASE_API = 'http://192.168.3.6:9000' -VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/.env.native b/.env.native index 09eb3fd7c..b8a05aae5 100644 --- a/.env.native +++ b/.env.native @@ -4,4 +4,4 @@ VUE_APP_PRO = 'local' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/' diff --git a/.env.production b/.env.production index 68c9d7458..11718e8ad 100644 --- a/.env.production +++ b/.env.production @@ -3,4 +3,4 @@ NODE_ENV = 'production' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/' diff --git a/.env.staging b/.env.staging index 2e62c739e..6e00a4872 100644 --- a/.env.staging +++ b/.env.staging @@ -3,4 +3,4 @@ NODE_ENV = 'production' # base api VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/' diff --git a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue index eb2504219..c9cf5c801 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue @@ -947,7 +947,7 @@ export default { padding: 0px; margin: 0px; max-height: 550px; - overflow-y: scroll; + /*overflow-y: scroll;*/ &::-webkit-scrollbar { width: 4px; @@ -972,10 +972,13 @@ export default { line-height: $menuItemHeight; width: $menuItemWidth; bottom: $menuItemHeight; + position: relative; + left: 180px; + padding-left: 0; } .active { - position: absolute; + /*position: absolute;*/ display: block !important; } diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue index 65a0fd046..65a4bd73d 100644 --- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue +++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue @@ -27,43 +27,11 @@ - -
- - - - - - - - -
- - {{ $t('global.cancel') }} - {{ $t('global.confirm') }} - -