-
+
+
-
- 在线
+ 在线
+
-
+ 
+
+
@@ -56,15 +57,33 @@ export default {
title: String,
// 右侧
showUserCenter: Boolean,
+ // 是否显示左边的状态
+ isShowLeftState: {
+ type: Boolean,
+ default() {
+ return true;
+ }
+ },
+ //是否是协作空间的顶部导航栏
+ isWorkspaceTopBar: Boolean,
},
data() {
return {
isWindowScrollIng: false,
isClient: system.isClient,
- isMaxWindowNow: true,
+ isMaxWindowNow: false,
+
};
},
- mounted: function () {
+ computed: {
+ adjustPadding() {
+ return this.showUserCenter ? {padding: `0 70px 0 45px`} : {padding: `0 64px 0 45px`}
+ }
+ },
+ created() {
+ this.isMaxWindowNow = this.$cookie.get('isMaxWindowNow') === 'true' ? Boolean(this.$cookie.get('isMaxWindowNow')) : false;
+ },
+ mounted() {
// 监听滚动事件 视情况判断是否要增加可以不监听滚动的入参
window.addEventListener("scroll", this.handleScroll.bind(this), true);
},
@@ -74,11 +93,13 @@ export default {
},
enlargeBrowserWindow() {
this.isMaxWindowNow = !this.isMaxWindowNow;
- if(!this.isMaxWindowNow) {
- system.unmaxBrowserWindow();
- } else {
- system.enlargeBrowserWindow();
- }
+ this.$cookie.set('isMaxWindowNow', this.isMaxWindowNow);//这里也需要存储 因为影响到别的地方组件isMaxWindowNow的初始化
+ system.enlargeBrowserWindow();
+ },
+ unmaxBrowserWindow() {
+ this.isMaxWindowNow = !this.isMaxWindowNow;
+ this.$cookie.set('isMaxWindowNow', this.isMaxWindowNow);
+ system.unmaxBrowserWindow();
},
closeBrowserWindow() {
system.closeBrowserWindow();
@@ -107,6 +128,9 @@ export default {
diff --git a/src/services/system.js b/src/services/system.js
index a3b329e7..31f112d0 100644
--- a/src/services/system.js
+++ b/src/services/system.js
@@ -66,6 +66,12 @@ const system = {
const { ipcRenderer } = global.electron;
await ipcRenderer.invoke('close-browser-window');
}),
+ // 判断当前窗口是否是最大化的状态
+ isMaxWindowNow: safeCall(async () => {
+ const { ipcRenderer } = global.electron;
+ const res = await ipcRenderer.invoke('is-max-window-now');
+ return res;
+ }),
// 保存客户端配置
initClientConfig: safeCall((path, errorHandler = identity) => {
const config = io('initClientConfig');
diff --git a/src/store/index.js b/src/store/index.js
index 419e3955..aab22ace 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,4 +1,3 @@
-
import { fetchApi } from '@/utils/request';
import { platform, PLATFORM_TYPE, AccessCode } from '@/utils/access';
import { firstCharToLowerCase } from '@/utils/tool';
@@ -14,7 +13,7 @@ const initialState = () => ({
currentCompanyId: undefined,
avator: undefined,
userInfo: {},
- client:system.isClient ? '桌面端':'WEB端'
+ client: system.isClient ? '桌面端' : 'WEB端',
});
const getBootstrapState = () => {
@@ -23,7 +22,7 @@ const getBootstrapState = () => {
const sessionState = JSON.parse(sessionStorage.getItem('user'));
const currentCompanyId = sessionStorage.getItem('companyId');
const currentPlatform = JSON.parse(sessionStorage.getItem('platform') || '{}');
- //sessionStorage.getItem('companyName');
+ //sessionStorage.getItem('companyName');
if (sessionState && sessionState.accountId) {
state.isLogin = true;
Object.assign(state, sessionState);
@@ -35,8 +34,7 @@ const getBootstrapState = () => {
state = initialState();
}
return state;
-}
-
+};
export default {
state: getBootstrapState(),
@@ -48,18 +46,18 @@ export default {
sessionStorage.CompanyName = JSON.parse(sessionStorage.platform).orgName;
sessionStorage.accountName = JSON.parse(sessionStorage.user).accountName;
- const params={
- API:'authentication/login',
- Action:'登录',
- CompanyName:sessionStorage.CompanyName,
- Subject:sessionStorage.accountName,
- Source:sessionStorage.client,
- }
- fetchApi('operation/record',params)
+ const params = {
+ API: 'authentication/login',
+ Action: '登录',
+ CompanyName: sessionStorage.CompanyName,
+ Subject: sessionStorage.accountName,
+ Source: sessionStorage.client,
+ };
+ fetchApi('operation/record', params);
},
async login(UserName, PassWord) {
const loginRes = await fetchApi('authentication/login', { UserName, PassWord });
-
+
const loginSucc = loginRes.Code === 0;
if (!loginSucc) {
return loginRes;
@@ -97,27 +95,34 @@ export default {
const isSuperAdmin = backgroundPermission === 3;
const isCompanyAdmin = backgroundPermission === 2;
- //
- if (isSuperAdmin) { // todo 服务商查询企业列表并生成platformList
+ //
+ if (isSuperAdmin) {
+ // todo 服务商查询企业列表并生成platformList
// todo 暂时将模板控制台加入到超管账号中
platformList.push(
- platform(PLATFORM_TYPE.MANAGE_CENTER, companyId, 'LOCKING 总后台', undefined, []),
+ platform(PLATFORM_TYPE.MANAGE_CENTER, companyId, 'LOCKING 总后台', undefined, [])
// platform(PLATFORM_TYPE.TEMPLATE_CONSOLE, CompanyId, undefined, false, '模版控制台'),
);
- } else { // 企业生成自己的企业平台权限
+ } else {
+ // 企业生成自己的企业平台权限
const companyInfoRes = await fetchApi('company/queryFrontDeskCompanyById', { id: companyId });
if (companyInfoRes.Code !== 0) {
return companyInfoRes;
}
const { Data = {} } = companyInfoRes;
- const { company: { LogoUrl, CompanyName } } = Data;
+ const {
+ company: { LogoUrl, CompanyName },
+ } = Data;
const accessList = [];
- if (isCompanyAdmin) { accessList.push(AccessCode.CompanyConsole); }
- if (permission === 1) { accessList.push(AccessCode.ProjectManager); }
+ if (isCompanyAdmin) {
+ accessList.push(AccessCode.CompanyConsole);
+ }
+ if (permission === 1) {
+ accessList.push(AccessCode.ProjectManager);
+ }
platformList.push(platform(PLATFORM_TYPE.COMPANY, companyId, CompanyName, LogoUrl, accessList));
}
-
// 存储
this.state.isLogin = true;
Object.assign(this.state, loginData);
@@ -129,19 +134,20 @@ export default {
return {
Code: loginRes.Code,
Data: loginData,
- }
+ };
},
- logout() {
+ async logout() {
this.state = initialState();
+
+ const params = {
+ API: 'authentication/loginOut',
+ Action: '注销',
+ CompanyName: sessionStorage.CompanyName,
+ Subject: sessionStorage.accountName,
+ Source: sessionStorage.client,
+ };
+ await fetchApi('operation/record', params);
fetchApi('authentication/loginOut');
- const params={
- API:'authentication/loginOut',
- Action:'注销',
- CompanyName:sessionStorage.CompanyName,
- Subject:sessionStorage.accountName,
- Source:sessionStorage.client,
- }
- fetchApi('operation/record',params)
sessionStorage.clear();
- }
-}
\ No newline at end of file
+ },
+};
diff --git a/src/views/components_web/project/newProj.vue b/src/views/components_web/project/newProj.vue
index 9267b87f..67b7259f 100644
--- a/src/views/components_web/project/newProj.vue
+++ b/src/views/components_web/project/newProj.vue
@@ -1,6 +1,6 @@
-
.header{
- box-shadow: none;
- }
+ box-shadow: none;
+}
.proj_manage{
width: 100%;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9f6558f8..0b53ec9e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -15,6 +15,9 @@
style="width:100%;height:98%;width:calc(100vw);height:calc(100vh);position: absolute;top:0"
class="login_bg"
>
+
+
欢迎使用
@@ -228,14 +231,21 @@
width: 5px;
}
+