From 706a73fafa5dc952339ebe430c4545a4054b9fe4 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 12 Oct 2022 15:38:21 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=99=BB=E9=99=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 4 ++- src/store/modules/projectConfig.js | 32 +++++++++++++++++++ src/views/login/index.vue | 9 +++--- .../frontProjectConfigManage/frontConfig.vue | 12 +++---- 4 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 src/store/modules/projectConfig.js diff --git a/src/store/index.js b/src/store/index.js index 2b18f7145..213cc4d6a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -19,6 +19,7 @@ import iscs from './modules/iscs'; import rpTools from './modules/rpTools'; import race from './modules/race'; import trainingNew from './modules/trainingNew'; +import projectConfig from './modules/projectConfig'; import getters from './getters'; @@ -44,7 +45,8 @@ const store = new Vuex.Store({ iscs, rpTools, race, - trainingNew + trainingNew, + projectConfig }, getters }); diff --git a/src/store/modules/projectConfig.js b/src/store/modules/projectConfig.js new file mode 100644 index 000000000..8682222b5 --- /dev/null +++ b/src/store/modules/projectConfig.js @@ -0,0 +1,32 @@ +const user = { + state: { + homeProLogoWidth:0, + loginProLogo:'', + homeTitle:'' + }, + mutations: { + setHomeProLogoWidth: (state, homeProLogoWidth) => { + state.homeProLogoWidth = homeProLogoWidth; + }, + setLoginProLogo: (state, loginProLogo) => { + state.loginProLogo = loginProLogo; + }, + setHomeTitle: (state, homeTitle) => { + state.homeTitle = homeTitle; + } + }, + actions: { + setHomeProLogoWidth({ commit }, homeProLogoWidth) { + commit('setHomeProLogoWidth', homeProLogoWidth); + }, + setLoginProLogo({ commit }, loginProLogo) { + commit('setLoginProLogo', loginProLogo); + }, + setHomeTitle({ commit }, homeTitle) { + commit('setHomeTitle', homeTitle); + } + + } +}; + +export default user; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index f5e39de92..f347c92da 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -42,7 +42,6 @@ export default { showBackPic:true, wechatLogin:true, loginProLogoWidth:0, - loginProLogoHeight:0, loginOrgTitle:'', loginProLogo:'' }; @@ -69,17 +68,19 @@ export default { if (response.data) { this.backProject = response.data.project; // loginProLogoHeight - const {showBackPic, wechatLogin, browserTitle, loginProtitle, loginProLogoWidth, loginOrgTitle, loginProLogo} = response.data.viewSetting; + const {showBackPic, wechatLogin, browserTitle, homeTitle, loginProtitle, loginProLogoWidth, loginOrgTitle, homeProLogoWidth, loginProLogo} = response.data.viewSetting; this.showBackPic = showBackPic; this.wechatLogin = wechatLogin; this.loginProtitle = loginProtitle; this.loginProLogoWidth = loginProLogoWidth; - // this.loginProLogoHeight = loginProLogoHeight; + // this.homeProLogoWidth = homeProLogoWidth; this.loginOrgTitle = loginOrgTitle; this.loginProLogo = loginProLogo ? this.$store.state.user.ossUrl + '/logo/' + loginProLogo : ''; document.title = browserTitle; document.querySelector("link[rel*='icon']").href = this.loginProLogo; - // document.querySelector("link[rel*='icon']").href = loginInfo[this.project].linkIcon || ProjectIcon[this.project] + this.$store.dispatch('projectConfig/setHomeProLogoWidth', homeProLogoWidth); + this.$store.dispatch('projectConfig/setLoginProLogo', this.loginProLogo); + this.$store.dispatch('projectConfig/setHomeTitle', homeTitle); // aboutSystem:"主体：北京玖琏科技有限公司 备案号：京ICP备2021039716号" // baseDevelopment // : diff --git a/src/views/system/frontProjectConfigManage/frontConfig.vue b/src/views/system/frontProjectConfigManage/frontConfig.vue index 3cb8ae794..9985c3c38 100644 --- a/src/views/system/frontProjectConfigManage/frontConfig.vue +++ b/src/views/system/frontProjectConfigManage/frontConfig.vue @@ -32,9 +32,9 @@ - + + + @@ -88,7 +88,7 @@ export default { loginContectInformation:false, // 登录页 是否显示联系方式 loginProLogo:'', // 登录页 logo loginProLogoWidth:0, // 登录页 logo 宽度 - // loginProLogoHeight:0, // 登录页 logo 高度 + homeProLogoWidth:0, // 主页 logo 宽度 browserTitle:'', // 浏览器页签名称 homeTitle:'', // 导航栏名称 @@ -145,7 +145,7 @@ export default { this.formModel.loginProLogo = viewSetting.loginProLogo || ''; this.formModel.loginProLogoWidth = viewSetting.loginProLogoWidth || 0; - // this.formModel.loginProLogoHeight = viewSetting.loginProLogoHeight || 0; + this.formModel.homeProLogoWidth = viewSetting.homeProLogoWidth || 0; this.formModel.browserTitle = viewSetting.browserTitle || ''; this.formModel.homeTitle = viewSetting.homeTitle || ''; @@ -171,7 +171,7 @@ export default { loginContectInformation:false, // 登录页 是否显示联系方式 loginProLogo:'', // 登录页 logo loginProLogoWidth:'', // 登录页 logo 宽度 - // loginProLogoHeight:'', // 登录页 logo 高度 + homeProLogoWidth:'', // 主页 logo 宽度 browserTitle:'', // 浏览器页签名称 homeTitle:'', // 导航栏名称 From 29216e6fbbcbad4d13b7a4fd001bb866366a8960 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 12 Oct 2022 15:43:25 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/projectConfig.js | 9 ++++++++- src/views/login/index.vue | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/store/modules/projectConfig.js b/src/store/modules/projectConfig.js index 8682222b5..86da36e3b 100644 --- a/src/store/modules/projectConfig.js +++ b/src/store/modules/projectConfig.js @@ -2,7 +2,8 @@ const user = { state: { homeProLogoWidth:0, loginProLogo:'', - homeTitle:'' + homeTitle:'', + setCaseShow:true }, mutations: { setHomeProLogoWidth: (state, homeProLogoWidth) => { @@ -13,6 +14,9 @@ const user = { }, setHomeTitle: (state, homeTitle) => { state.homeTitle = homeTitle; + }, + setCaseShow: (state, caseShow) => { + state.caseShow = caseShow; } }, actions: { @@ -24,6 +28,9 @@ const user = { }, setHomeTitle({ commit }, homeTitle) { commit('setHomeTitle', homeTitle); + }, + setCaseShow({ commit }, caseShow) { + commit('setCaseShow', caseShow); } } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index f347c92da..ff4a525e6 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -68,7 +68,7 @@ export default { if (response.data) { this.backProject = response.data.project; // loginProLogoHeight - const {showBackPic, wechatLogin, browserTitle, homeTitle, loginProtitle, loginProLogoWidth, loginOrgTitle, homeProLogoWidth, loginProLogo} = response.data.viewSetting; + const {showBackPic, wechatLogin, browserTitle, homeTitle, caseShow, loginProtitle, loginProLogoWidth, loginOrgTitle, homeProLogoWidth, loginProLogo} = response.data.viewSetting; this.showBackPic = showBackPic; this.wechatLogin = wechatLogin; this.loginProtitle = loginProtitle; @@ -81,6 +81,8 @@ export default { this.$store.dispatch('projectConfig/setHomeProLogoWidth', homeProLogoWidth); this.$store.dispatch('projectConfig/setLoginProLogo', this.loginProLogo); this.$store.dispatch('projectConfig/setHomeTitle', homeTitle); + this.$store.dispatch('projectConfig/setCaseShow', caseShow); + // aboutSystem:"主体：北京玖琏科技有限公司 备案号：京ICP备2021039716号" // baseDevelopment // : From a3e908d1c21b9b6757864fd678e2cb9b3d8d9126 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 12 Oct 2022 16:33:45 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 5 +++-- src/views/login/index.vue | 3 ++- src/views/system/frontProjectConfigManage/index.vue | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index df3a88857..257767c77 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -106,13 +106,14 @@ const user = { Login({ commit }, userInfo) { const username = userInfo.username.trim(); const password = userInfo.password.trim(); - const type = userInfo.type; + // const type = userInfo.type; + const type = 'class'; const project = userInfo.project; const deviceCode = userInfo.deviceCode; const teacherLogin = userInfo.teacherLogin; return new Promise((resolve, reject) => { // 登录系统 - const params = Object.assign({ account: username, password, project:project, deviceCode:deviceCode, teacherLogin:teacherLogin }, type == 'design' ? LoginParams.Design : LoginParams.LianKeTang); + const params = Object.assign({ account: username, password, project:project, deviceCode:deviceCode, teacherLogin:teacherLogin }, LoginParams.LianKeTang); login(params).then(resp => { const token = resp.data; const header = { group: '', 'X-Token': token }; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ff4a525e6..330149b4d 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -25,6 +25,7 @@ + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ce0e210ec..99002f1ce 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -13,7 +13,6 @@ {{ loginOrgTitle }} -
{{ loginProtitle }}
@@ -21,6 +20,10 @@
+ +
+ {{ aboutSystem }} +
@@ -31,9 +34,10 @@ import LangStorage from '@/utils/lang'; import { getFrontProjectConfigByLogin} from '@/api/projectConfig'; import WechatLogin from './wechatLogin'; import NormalLogin from './normalLogin'; +import BaseDevelopment from './baseDevelopment'; export default { name:'LoginNew', - components: { WechatLogin, NormalLogin }, + components: { WechatLogin, NormalLogin, BaseDevelopment }, data() { return { backProject:'', @@ -43,8 +47,10 @@ export default { showBackPic:true, wechatLogin:true, loginProLogoWidth:0, + baseDevelopment:false, // 是否显示基于系统开发 loginOrgTitle:'', - loginProLogo:'' + loginProLogo:'', + aboutSystem:'' }; }, computed: { @@ -69,7 +75,7 @@ export default { if (response.data) { this.backProject = response.data.project; // loginProLogoHeight - const {showBackPic, wechatLogin, browserTitle, homeTitle, caseShow, loginProtitle, loginProLogoWidth, loginOrgTitle, homeProLogoWidth, loginProLogo} = response.data.viewSetting; + const {showBackPic, wechatLogin, aboutSystem, baseDevelopment, browserTitle, homeTitle, caseShow, loginProtitle, loginProLogoWidth, loginOrgTitle, homeProLogoWidth, loginProLogo} = response.data.viewSetting; this.showBackPic = showBackPic; this.wechatLogin = wechatLogin; this.loginProtitle = loginProtitle; @@ -77,41 +83,17 @@ export default { // this.homeProLogoWidth = homeProLogoWidth; this.loginOrgTitle = loginOrgTitle; this.loginProLogo = loginProLogo ? this.$store.state.user.ossUrl + '/logo/' + loginProLogo : ''; + this.aboutSystem = aboutSystem; + this.baseDevelopment = baseDevelopment; document.title = browserTitle; document.querySelector("link[rel*='icon']").href = this.loginProLogo; this.$store.dispatch('setHomeProLogoWidth', homeProLogoWidth); this.$store.dispatch('setLoginProLogo', this.loginProLogo); this.$store.dispatch('setHomeTitle', homeTitle); this.$store.dispatch('setCaseShow', caseShow); - setSessionStorage('project', this.project); - // aboutSystem:"主体：北京玖琏科技有限公司 备案号：京ICP备2021039716号" - // baseDevelopment - // : - // false - // caseShow - // : - // true // helpShow - // : - // true - // homeTitle - // : - // "城市轨道交通平台" - // loginContectInformation - // : - // false - // loginOrgTitle - // : - // "" - // loginProLogo - // : - // "" - // loginProLogoHeight - // : - // "" - // loginProLogoWidth - // : - // "" + // 登录页 是否显示联系方式 loginContectInformation false + setSessionStorage('project', this.project); } }).catch(() => { this.$messageBox('无效的登录路径，请查证路径后重试！'); @@ -151,7 +133,7 @@ export default { .text-box { font-size: 37px; font-weight: bold; - top: -60px; + top: -70px; width: 1200px; text-align: center; position: absolute; @@ -169,10 +151,19 @@ export default { } .left-logo-box { position: absolute; - top: 30px; + top: 2%; font-size: 28px; font-weight: bold; - left: 30px; + left: 2%; +} +.logo { + vertical-align: middle; +} +.bottomInfo{ + position: absolute; + bottom: 10px; + right: 20px; + font-size: 14px; } diff --git a/src/views/login/normalLogin.vue b/src/views/login/normalLogin.vue index 2880391bd..02ac4d2ec 100644 --- a/src/views/login/normalLogin.vue +++ b/src/views/login/normalLogin.vue @@ -234,10 +234,10 @@ export default { } }; -