diff --git a/.env.native b/.env.heb similarity index 100% rename from .env.native rename to .env.heb diff --git a/.env.ntyl b/.env.ntyl new file mode 100644 index 000000000..cbcd4c513 --- /dev/null +++ b/.env.ntyl @@ -0,0 +1,7 @@ +# just a flag +NODE_ENV = 'production' +VUE_APP_PRO = 'ntyl' + +# base api +VUE_APP_BASE_API = 'https://joylink.club/jlcloud' +VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' diff --git a/package.json b/package.json index bfa5fbbe1..c229cb040 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve", "build": "vue-cli-service build --mode production", "test": "vue-cli-service build --mode staging", - "local": "vue-cli-service build --mode native", + "local": "vue-cli-service build --mode", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", "test:unit": "jest --clearCache && vue-cli-service test:unit", diff --git a/src/jlmap3d/edit/testEditorModel/StationStandList.js b/src/jlmap3d/edit/testEditorModel/StationStandList.js index 9e174cc96..4711084ed 100644 --- a/src/jlmap3d/edit/testEditorModel/StationStandList.js +++ b/src/jlmap3d/edit/testEditorModel/StationStandList.js @@ -93,9 +93,10 @@ export function StationStandList() { let jlmapstationdata = jlmapdata.stationList; let jlmapstanddata = jlmapdata.stationStandList; // jlmapstationdata.splice(0,1); + console.log(jlmapstationdata); for(let i=0;i= points[0].x) && (points[points.length - 1].y >= points[0].y); +} + // 同步绘制数据到原始数据 export function updateForList(model, state, lstName) { const list = state.map[lstName]; diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 44624170b..fe07413c4 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -55,7 +55,7 @@ export const loginInfo = { systemType: '011' }, ntyc: { - title: '南京铁道职业技术学院城市轨道交通实训平台(专用版)', + title: '城轨高级信号系统(云平台专用版)', loginPath: '/login?project=ntyc', loginParam: 'NTYC', titleDistance: '-150px', @@ -64,7 +64,7 @@ export const loginInfo = { systemType: '011' }, ntyl: { - title: '南京铁道职业技术学院城市轨道交通实训平台', + title: '城轨高级信号系统(本地专用版)', loginPath: '/login?project=ntyl', loginParam: 'NTYL', titleDistance: '-150px', @@ -73,7 +73,7 @@ export const loginInfo = { systemType: '011' }, nty: { - title: '南京铁道职业技术学院城市轨道交通实训平台(通用版)', + title: '城轨高级信号系统(云平台通用版)', loginPath:'/login?project=nty', loginParam: 'NTY', titleDistance: '-150px', @@ -137,7 +137,7 @@ export const loginInfo = { systemType: '013' }, designntyl: { - title: '南京铁道职业技术学院城市轨道交通设计平台', + title: '城轨高级信号设计系统(本地专用版)', loginPath:'/design/login?project=ntyl', loginParam: 'NTYL', titleDistance: '-150px', @@ -146,7 +146,7 @@ export const loginInfo = { systemType: '011' }, designntyc: { - title: '南京铁道职业技术学院城市轨道交通设计平台(专用版)', + title: '城轨高级信号设计系统(云平台专用版)', loginPath:'/design/login?project=ntyc', loginParam: 'NTYC', titleDistance: '-150px', @@ -155,7 +155,7 @@ export const loginInfo = { systemType: '011' }, designnty: { - title: '南京铁道职业技术学院城市轨道交通设计平台(通用版)', + title: '城轨高级信号设计系统(云平台通用版)', loginPath:'/design/login?project=nty', loginParam: 'NTY', titleDistance: '-150px', @@ -417,7 +417,7 @@ export const ProjectIcon = { designnty: FaviconNty, ntyc: FaviconNty, designntyc: FaviconNty, - nty1: FaviconNty, + ntyl: FaviconNty, designntyl: FaviconNty, bjd: FaviconBjd, designbjd: FaviconBjd, @@ -439,7 +439,7 @@ export const ProjectCode = { nty: 'NTY', designnty: 'NTY', ntyl: 'NTYL', - designnty1: 'NTYL', + designntyl: 'NTYL', ntyc: 'NTYC', designntyc: 'NTYC', bjd: 'BJD', @@ -448,7 +448,7 @@ export const ProjectCode = { designsdy: 'SDY' }; export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd']; // 底部栏仅展示公司信息不展示备案号 -export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designnty1']; // 实训设计平台通过项目code获取地图列表的项目 +export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'hyd', 'designhyd']; // 登录页右下角版本开发基于不展示 export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd']; // 登录页右下角主体不展示 @@ -484,7 +484,11 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台 bjd: '/design/login?project=bjd', designbjd: '/login?project=bjd', sdy: '/design/login?project=sdy', - designsdy: '/login?project=sdy' + designsdy: '/login?project=sdy', + ntyl: '/design/login?project=ntyl', + designntyl: '/login?project=ntyl', + ntyc: '/design/login?project=ntyl', + designntyc: '/login?project=ntyc' }; export const ProjectList = [ {value:'xty', label:'西铁院'}, diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue index 8878aadd6..d783c8b92 100644 --- a/src/views/components/filterCity/index.vue +++ b/src/views/components/filterCity/index.vue @@ -51,9 +51,9 @@ export default { // const cityList = resp.sort((a, b) => { // return a.code.localeCompare(b.code); // }); - const cityList = resp; + const cityList = resp || []; this.filterOptions = resp; - this.filterSelect = localStore.get(this.localParamName) || cityList[0].code; + this.filterSelect = localStore.get(this.localParamName) || (cityList[0] || {}).code; this.$emit('filterSelectChange', this.filterSelect); }, filterSelectChange(filterSelect) { diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index cbf1f8f18..9c2c3b88a 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -58,6 +58,7 @@ export default { }, getMapByCode() { const project = getSessionStorage('project'); + console.log(project, GetMapListByProjectList.includes(project)); return GetMapListByProjectList.includes(project); } }, diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue index 04a9087a0..c11b8a8ab 100644 --- a/src/views/jlmap3d/drive/jl3ddrive.vue +++ b/src/views/jlmap3d/drive/jl3ddrive.vue @@ -163,12 +163,12 @@ export default { this.jlmap3d.endsocket(); this.jlmap3d.dispose(); this.jlmap3d = null; - // window.removeEventListener('popstate', this.goBack, false); + // this.$destroy(); } }, destroyed(){ - + // window.removeEventListener('popstate', this.goBack, false); }, computed: { userId() { @@ -191,19 +191,22 @@ export default { // this.$refs.mmiui.init(); }, methods: { - // goBack(){ - // if(this.$route.query.type == "DRIVE"){ - // store.dispatch('LogOut').then(() => { - // location.reload(); - // }); - // }else{ - // this.$emit('showdriving'); - // this.jlmap3d.eventoff(); - // this.jlmap3d.animateoff(); - // // this.jlmap3d = null; - // } - // // this.jlmap3d = null; - // }, + // goBack(){ + // console.log(this.$route); + // if(this.$route.query.type == "DRIVE"){ + // store.dispatch('LogOut').then(() => { + // location.reload(); + // }); + // }else{ + // this.$emit('showdriving'); + // if(this.jlmap3d){ + // this.jlmap3d.eventoff(); + // this.jlmap3d.animateoff(); + // } + // + // // this.jlmap3d = null; + // } + // }, show: function (skinCode,group,zindex) { // console.log("show"); // console.log(skinCode); @@ -270,6 +273,7 @@ export default { }, back() { + if(this.$route.query.type == "DRIVE"){ store.dispatch('LogOut').then(() => { location.reload(); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 0bb744fd0..1895a8dfc 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -7,7 +7,7 @@ :element-loading-text="loadingText" element-loading-background="rgba(0, 0, 0, 0)" > -
+
{{ loginTitle==='空串'?'':loginTitle }}
@@ -16,12 +16,12 @@ {{ language }}
-
+
{{ title }}
-
+