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/api/management/distribute.js b/src/api/management/distribute.js index 97c19a813..dccf6ffee 100644 --- a/src/api/management/distribute.js +++ b/src/api/management/distribute.js @@ -68,3 +68,10 @@ export function givePermission(data) { data: data }); } +/** 创建项目权限包 */ +export function createProjectPackage(projectCode, num) { + return request({ + url: `/api/distribute/${projectCode}/allMap/distribute?num=${num}`, + method: 'post' + }); +} diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js index e5aa5a974..ee6e0bd8b 100644 --- a/src/i18n/langs/en/publish.js +++ b/src/i18n/langs/en/publish.js @@ -108,7 +108,7 @@ export default { inputQuestionNumber: 'Please input question number', inputQuestionNumberError: 'The number of questions entered must be greater than 0', inputValidNumber: 'Please input valid number', - inputNumberError: 'The input value must be greater than the number of questions', + inputNumberError: 'The input value must be less than the number of questions', inputScorePerQuestion: 'Please input score per question', selectTestType: 'Please select test type', modifyRules: 'Modify Rules', diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js index 98d7d99f5..d6e3cf067 100644 --- a/src/i18n/langs/zh/publish.js +++ b/src/i18n/langs/zh/publish.js @@ -109,7 +109,7 @@ export default { inputQuestionNumber: '请输入题数', inputQuestionNumberError: '输入的题数大于0', inputValidNumber: '请输入有效数字', - inputNumberError: '输入值必须大于题数', + inputNumberError: '输入值必须小于题数', inputScorePerQuestion: '请输入每题分值', // inputNumericType 请输入数字值 // addRules 添加规则 diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index d3b640253..b036c1e9e 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -50,13 +50,8 @@ class StationStand extends Group { this.isShowShape = true; this.create(); this.createMouseEvent(); - // if (isShowThePrdType(model.prdType, style.StationStand.common.functionButtonShow) || model.previewOrMapDraw) { - // this.createFunctionButton(); - // } - // if (model.previewOrMapDraw) { - // this.setShowMode(); - // } this.setVisible(model.visible); + this.setShowMode(); this.setState(model); } create() { 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 ee13c9e20..5ebbb92dd 100644 --- a/src/views/components/filterCity/index.vue +++ b/src/views/components/filterCity/index.vue @@ -52,9 +52,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/ibp/copy.vue b/src/views/ibp/copy.vue index b474d5a36..a8c3cc1d9 100644 --- a/src/views/ibp/copy.vue +++ b/src/views/ibp/copy.vue @@ -77,7 +77,7 @@ export default { } else { this.ibpStationMap[item.mapId] = [item.stationCode]; } - this.ibpMap[item.stationCode] = item.id; + this.ibpMap[ item.mapId + '-' + item.stationCode] = item.id; }); } } catch (e) { @@ -108,7 +108,7 @@ export default { this.$refs.dataform.validateForm(() => { const param = { mapId: this.$route.params.mapId, - ibpId: this.ibpMap[this.formModel.dataStationCode], + ibpId: this.ibpMap[this.formModel.dataMapId + '-' + this.formModel.dataStationCode], stationCode: this.formModel.stationCode }; copyIbpData(param).then(resp => { diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue index 3e8a775c5..e55e39854 100644 --- a/src/views/ibp/ibpsystem/index.vue +++ b/src/views/ibp/ibpsystem/index.vue @@ -2,6 +2,7 @@
{{ $t('global.back') }} + 退出 @@ -264,6 +265,9 @@ export default { } }); }, + quit() { + window.close(); + }, ibpDestroy() { if (this.$ibp) { this.$ibp.dispose(); diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue index 0ee244475..96239aca4 100644 --- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue +++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue @@ -114,18 +114,18 @@ export default { this.loading = false; this.$message.success(this.$t('tip.coursePublishSuccessful')); this.doClose(); - }).catch(() => { + }).catch((error) => { this.loading = false; - this.$messageBox(this.$t('tip.coursePublishFailed')); + this.$messageBox(this.$t('tip.coursePublishFailed') + ':' + error.message); }); } else if (valid && !this.hasRelease) { releaseOrCancel(this.editModel.id, '1').then(response => { this.loading = false; this.$message.success(this.$t('tip.coursePublishSuccessful')); this.doClose(); - }).catch(() => { + }).catch((error) => { this.loading = false; - this.$messageBox(this.$t('tip.coursePublishFailed')); + this.$messageBox(this.$t('tip.coursePublishFailed') + ':' + error.message); }); } else { this.loading = false; 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 }}
-
+