diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 5ef7daecd..fad2bc0bd 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -914,6 +914,12 @@ export const RegisterCodeList = ['cgy', 'designcgy']; export const RichorContectUsList = ['richor', 'richorygy', 'richorhhcj', 'designrichorhhcj', 'richorcxjs', 'designrichorcxjs']; /** 帮助中不展示版权(福州 佛山) */ export const NoCopyrightList = ['richor', 'richorygy', 'richorhhcj', 'designrichorhhcj', 'richorcxjs', 'designrichorcxjs']; +/** 真实cctv */ +export const RealCctvList = ['richorjoint', 'richorhhcj']; +export const RealCctvMap = { + richorjoint: 'http://192.168.1.254', + richorhhcj: 'http://192.168.0.254' +}; /** 导航栏快速切换平台 */ export const goOtherPlatformMenu = { login: '/design/login', diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 693da582b..86b9e48c1 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -148,7 +148,7 @@ import bgPsdImg from '@/assets/bg_psd.png'; import HandRight from '@/assets/hand-o-right.png'; import wchat from '@/assets/wchat.png'; import { UrlConfig } from '@/scripts/ConstDic'; -import { loginInfo, ProjectIcon, ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList} from '@/scripts/ProjectConfig'; +import { loginInfo, ProjectIcon, ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList, RealCctvList} from '@/scripts/ProjectConfig'; import { removeToken, getToken } from '@/utils/auth'; import LangStorage from '@/utils/lang'; import FloatPart from './floatPart'; @@ -485,7 +485,7 @@ export default { projectDevice: this.$route.query.projectDevice, type: this.$route.query.type} }); } else if (this.$route.query.type == 'CCTV') { - if (this.project == 'richorjoint') { + if (RealCctvList.includes(this.project)) { this.$router.push({ path:'/jointTrainingNewCCTV', query:{ diff --git a/src/views/newMap/jointTrainingNew/realCCTV.vue b/src/views/newMap/jointTrainingNew/realCCTV.vue index 16b3ded3f..3977b36db 100644 --- a/src/views/newMap/jointTrainingNew/realCCTV.vue +++ b/src/views/newMap/jointTrainingNew/realCCTV.vue @@ -3,12 +3,12 @@
@@ -22,6 +22,8 @@