From a41c87a94a0b52688420a7af3b242bc771628e28 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 19 七月 2024 17:30:32 +0800
Subject: [PATCH] 登录logo更新
---
src/api/tigerapi/model/router.ts | 3 +
src/utils/env.ts | 16 +++++--
types/global.d.ts | 9 ++++
src/hooks/setting/index.ts | 18 ++++++---
src/components/Application/src/AppLogo.vue | 6 +-
.env | 3 +
types/config.d.ts | 2 +
src/views/tigerprojects/mes/eng/route/index.vue | 5 ++
src/layouts/default/header/components/user-dropdown/index.vue | 6 ++-
src/views/dashboard/workbench/components/WorkbenchHeader.vue | 11 +++--
src/views/sys/login/Login.vue | 7 ++-
src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue | 23 ++++++++++-
src/components/Application/src/LoginLogo.vue | 9 ++--
13 files changed, 87 insertions(+), 31 deletions(-)
diff --git a/.env b/.env
index 11e1f42..c141e2e 100644
--- a/.env
+++ b/.env
@@ -2,3 +2,6 @@
VITE_GLOB_APP_TITLE = HongHu NX
# port
VITE_PORT = 3100
+
+#systm type WMS/MES
+VITE_APP_TYPE = WMS
diff --git a/src/api/tigerapi/model/router.ts b/src/api/tigerapi/model/router.ts
index dfb64bf..377a3c4 100644
--- a/src/api/tigerapi/model/router.ts
+++ b/src/api/tigerapi/model/router.ts
@@ -101,7 +101,8 @@
GPH_Y: number;
GPH_PROP: string;
GPH_TEXT: string;
- NEED_SETUP: number;
+ NEED_SETUP: string;
+ NEED_RESET: string;
// DO_TYPE: number;
// DO_METHOD: string;
// DO_IF_PASS: string;
diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue
index 7ccc301..ab973ca 100644
--- a/src/components/Application/src/AppLogo.vue
+++ b/src/components/Application/src/AppLogo.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-17 14:51:25
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-17 10:00:16
+ * @LastEditTime: 2024-07-19 17:12:04
-->
<!--
* @Author: Vben
@@ -45,8 +45,8 @@
const { prefixCls } = useDesign('app-logo');
const { getCollapsedShowTitle } = useMenuSetting();
const userStore = useUserStore();
- const { title, downloadUrl } = useGlobSetting();
- const logoUrl = ref(`${downloadUrl}\\logo-1.png`)
+ const { title, systemType, downloadUrl } = useGlobSetting();
+ const logoUrl = ref(`${downloadUrl}\\${systemType}-logo.png`)
const go = useGo();
const getAppLogoClass = computed(() => [
diff --git a/src/components/Application/src/LoginLogo.vue b/src/components/Application/src/LoginLogo.vue
index 8e9bc2f..ead8112 100644
--- a/src/components/Application/src/LoginLogo.vue
+++ b/src/components/Application/src/LoginLogo.vue
@@ -4,18 +4,18 @@
* @version:
* @Date: 2024-06-17 14:51:25
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-06-19 09:51:43
+ * @LastEditTime: 2024-07-19 17:11:43
-->
<template>
<div class="anticon" :class="getAppLogoClass" @click="goHome">
- <img src="../../../assets/images/loginlogo.png" />
+ <img :src="loginLogoUrl" />
<div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
{{ title }}
</div>
</div>
</template>
<script lang="ts" setup>
- import { computed, unref } from 'vue';
+ import { computed, ref, unref } from 'vue';
import { useGlobSetting } from '@/hooks/setting';
import { useGo } from '@/hooks/web/usePage';
import { useMenuSetting } from '@/hooks/setting/useMenuSetting';
@@ -41,7 +41,8 @@
const { prefixCls } = useDesign('app-logo');
const { getCollapsedShowTitle } = useMenuSetting();
const userStore = useUserStore();
- const { title } = useGlobSetting();
+ const { title, systemType, downloadUrl } = useGlobSetting();
+ const loginLogoUrl = ref(`${downloadUrl}\\${systemType}-loginlogo.png`)
const go = useGo();
const getAppLogoClass = computed(() => [
diff --git a/src/hooks/setting/index.ts b/src/hooks/setting/index.ts
index b7edba1..bfa8ff4 100644
--- a/src/hooks/setting/index.ts
+++ b/src/hooks/setting/index.ts
@@ -1,23 +1,28 @@
/*
* @Description: file content
* @Author: your name
- * @version:
+ * @version:
* @Date: 2024-06-17 14:51:26
- * @LastEditors: your name
- * @LastEditTime: 2024-06-17 15:54:48
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-07-19 17:10:35
*/
import type { GlobConfig } from '#/config';
import { getAppEnvConfig } from '@/utils/env';
export const useGlobSetting = (): Readonly<GlobConfig> => {
- const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_UPLOAD_URL,
+ const {
+ VITE_GLOB_APP_TITLE,
+ VITE_GLOB_API_URL,
+ VITE_GLOB_API_URL_PREFIX,
+ VITE_GLOB_UPLOAD_URL,
VITE_GLOB_SYS_API_URL,
VITE_GLOB_MAP_KEY,
VITE_GLOB_TSK_API_URL,
VITE_GLOB_DOWNLOAD_URL,
- VITE_USE_ORG, } =
- getAppEnvConfig();
+ VITE_APP_TYPE,
+ VITE_USE_ORG,
+ } = getAppEnvConfig();
// Take global configuration
const glob: Readonly<GlobConfig> = {
@@ -31,6 +36,7 @@
mapKey: VITE_GLOB_MAP_KEY,
downloadUrl: VITE_GLOB_DOWNLOAD_URL,
useOrg: VITE_USE_ORG,
+ systemType: VITE_APP_TYPE,
};
return glob as Readonly<GlobConfig>;
};
diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue
index d133d36..78717c9 100644
--- a/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
@@ -44,7 +44,7 @@
<script lang="ts" setup>
import { Dropdown, Menu } from 'ant-design-vue';
import type { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
- import { computed } from 'vue';
+ import { computed, ref } from 'vue';
import { DOC_URL } from '@/settings/siteSetting';
import { useUserStore } from '@/store/modules/user';
import { useHeaderSetting } from '@/hooks/setting/useHeaderSetting';
@@ -55,6 +55,7 @@
import { propTypes } from '@/utils/propTypes';
import { openWindow } from '@/utils';
import { createAsyncComponent } from '@/utils/factory/createAsyncComponent';
+import { useGlobSetting } from '/@/hooks/setting';
type MenuEvent = 'logout' | 'doc' | 'lock' | 'api';
@@ -72,10 +73,11 @@
const { t } = useI18n();
const { getShowDoc, getUseLockPage, getShowApi } = useHeaderSetting();
const userStore = useUserStore();
+ const { systemType, downloadUrl } = useGlobSetting();
const getUserInfo = computed(() => {
const { realName = '', avatar, desc } = userStore.getUserInfo || {};
- return { realName, avatar: avatar || headerImg, desc };
+ return { realName, avatar: avatar || `${downloadUrl}\\${systemType}-header.jpg`, desc };
});
const [register, { openModal }] = useModal();
diff --git a/src/utils/env.ts b/src/utils/env.ts
index 061cdd8..ab6b850 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -1,10 +1,10 @@
/*
* @Description: file content
* @Author: your name
- * @version:
+ * @version:
* @Date: 2024-06-17 14:51:26
- * @LastEditors: your name
- * @LastEditTime: 2024-06-17 15:54:10
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-07-19 17:10:02
*/
import type { GlobEnvConfig } from '#/config';
import pkg from '../../package.json';
@@ -38,12 +38,17 @@
? // Get the global configuration (the configuration will be extracted independently when packaging)
(import.meta.env as unknown as GlobEnvConfig)
: (window[ENV_NAME] as unknown as GlobEnvConfig);
- const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_UPLOAD_URL,
+ const {
+ VITE_GLOB_APP_TITLE,
+ VITE_GLOB_API_URL_PREFIX,
+ VITE_GLOB_UPLOAD_URL,
VITE_GLOB_SYS_API_URL,
VITE_GLOB_MAP_KEY,
VITE_GLOB_TSK_API_URL,
VITE_GLOB_DOWNLOAD_URL,
- VITE_USE_ORG, } = ENV;
+ VITE_APP_TYPE,
+ VITE_USE_ORG,
+ } = ENV;
let { VITE_GLOB_API_URL } = ENV;
if (localStorage.getItem(API_ADDRESS)) {
const address = JSON.parse(localStorage.getItem(API_ADDRESS) || '{}');
@@ -59,6 +64,7 @@
VITE_GLOB_TSK_API_URL,
VITE_GLOB_DOWNLOAD_URL,
VITE_USE_ORG,
+ VITE_APP_TYPE,
};
}
diff --git a/src/views/dashboard/workbench/components/WorkbenchHeader.vue b/src/views/dashboard/workbench/components/WorkbenchHeader.vue
index 5cdb89b..6393267 100644
--- a/src/views/dashboard/workbench/components/WorkbenchHeader.vue
+++ b/src/views/dashboard/workbench/components/WorkbenchHeader.vue
@@ -4,12 +4,12 @@
* @version:
* @Date: 2024-06-18 15:09:48
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-17 03:16:28
+ * @LastEditTime: 2024-07-19 17:11:23
-->
<template>
<div class="lg:flex">
<!-- !mx-auto -->
- <Avatar :src="userinfo.avatar || headerImg" :size="64" :shape="square" class="!block"/>
+ <Avatar :src="userinfo.avatar || headerUrl" :size="64" :shape="square" class="!block"/>
<div class="md:ml-12 flex flex-col justify-start md:mt-0 mt-2">
<h1 class="md:text-lg text-md">鏃╁畨, {{ userinfo.realName }}, 寮�濮嬫偍涓�澶╃殑宸ヤ綔鍚э紒</h1>
<span class="text-secondary"> 浠婃棩鏅达紝20鈩� - 32鈩冿紒 </span>
@@ -17,13 +17,16 @@
</div>
</template>
<script lang="ts" setup>
- import { computed } from 'vue';
+ import { computed, ref } from 'vue';
import { Avatar } from 'ant-design-vue';
import { useUserStore } from '/@/store/modules/user';
- import headerImg from '/@/assets/images/header.jpg';
+ // import headerImg from '/@/assets/images/header.jpg';
+ import { useGlobSetting } from '@/hooks/setting';
// import headerImg from '/@/assets/images/title.jpg';
const userStore = useUserStore();
const userinfo = computed(() => userStore.getUserInfo);
const square = "square"; // "circle";
+ const { systemType, downloadUrl } = useGlobSetting();
+ const headerUrl = ref(`${downloadUrl}\\${systemType}-header.jpg`)
</script>
diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue
index a06197d..69c1f96 100644
--- a/src/views/sys/login/Login.vue
+++ b/src/views/sys/login/Login.vue
@@ -24,8 +24,8 @@
class="w-1/2 -mt-16 -enter-x"
/> -->
<div class="mt-10 font-medium text-white -enter-x">
- <span class="inline-block mt-4 text-3xl"> {{ t('楦块箘鏅鸿兘鏅洪�燤ES绯荤粺') }}</span>
- <!-- <span class="inline-block mt-4 text-3xl"> {{ t('鍒涜姱浜烘櫤鑳芥櫤閫燱MS绯荤粺') }}</span> -->
+ <span v-if="!IsMes" class="inline-block mt-4 text-3xl"> {{ t('楦块箘鏅鸿兘鏅洪�燱MS绯荤粺') }}</span>
+ <span v-if="IsMes" class="inline-block mt-4 text-3xl"> {{ t('鍒涜姱浜烘櫤鑳芥櫤閫燤ES绯荤粺') }}</span>
</div>
<div class="mt-5 font-normal text-white dark:text-gray-500 -enter-x">
{{ t('鏈潵鍙 鏁板瓧鍖栨櫤閫犲钩鍙�') }}
@@ -54,7 +54,7 @@
import { useDesign } from '@/hooks/web/useDesign';
import { useI18n } from '@/hooks/web/useI18n';
import { useLocaleStore } from '@/store/modules/locale';
- import { computed } from 'vue';
+ import { computed, ref } from 'vue';
import ForgetPasswordForm from './ForgetPasswordForm.vue';
import LoginForm from './LoginForm.vue';
import MobileForm from './MobileForm.vue';
@@ -73,6 +73,7 @@
const localeStore = useLocaleStore();
const showLocale = localeStore.getShowPicker;
const title = computed(() => globSetting?.title ?? '');
+ const IsMes = ref(globSetting.systemType == 'MES');
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-login';
diff --git a/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue b/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue
index 1f55e0a..7f6c6f1 100644
--- a/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue
+++ b/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue
@@ -3,8 +3,8 @@
* @Author: your name
* @version:
* @Date: 2024-05-01 17:18:49
- * @LastEditors: your name
- * @LastEditTime: 2024-06-18 00:20:58
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-07-19 15:58:20
-->
<!--
* @Description: 琛ㄥ崟椤瑰睘鎬э紝鎺т欢灞炴�ч潰鏉�
@@ -72,6 +72,14 @@
:options="needSetupOptions"
/>
</FormItem>
+ <FormItem label="鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)" name="鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)">
+ <Select
+ ref="select"
+ v-model:value="routeConfig.currentAct.NEED_RESET"
+ style="width: 150px"
+ :options="needResetOptions"
+ />
+ </FormItem>
<FormItem label="鏄惁鍚敤" name="鏄惁鍚敤">
<Select
ref="select"
@@ -120,6 +128,16 @@
label: '鏃犻渶璁剧疆',
},
]);
+ const needResetOptions = ref<SelectTypes['options']>([
+ {
+ value: 'Y',
+ label: '鏄�',
+ },
+ {
+ value: 'N',
+ label: '鍚�',
+ },
+ ]);
const actTypeLable = unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name';
watch(
() => routeConfig.currentAct,
@@ -135,6 +153,7 @@
r.ACT_TYPE = newVal.ACT_TYPE;
r.ACT_CODE = newVal.ACT_CODE;
r.NEED_SETUP = newVal.NEED_SETUP;
+ r.NEED_RESET = newVal.NEED_RESET;
// r.DO_TYPE = newVal.DO_TYPE;
// r.DO_METHOD = newVal.DO_METHOD;
// r.DO_IF_PASS = newVal.DO_IF_PASS;
diff --git a/src/views/tigerprojects/mes/eng/route/index.vue b/src/views/tigerprojects/mes/eng/route/index.vue
index 7c9646d..757a64a 100644
--- a/src/views/tigerprojects/mes/eng/route/index.vue
+++ b/src/views/tigerprojects/mes/eng/route/index.vue
@@ -234,6 +234,7 @@
ACT_NAME: isNullOrEmpty(a.ACT_NAME) ? `${n.text.value}_${_num}` : a.ACT_NAME,
ACT_CODE: a.ACT_CODE,
NEED_SETUP: a.NEED_SETUP,
+ NEED_RESET: a.NEED_RESET,
NODE_ID: a.NODE_ID,
ACT_TYPE: a.ACT_TYPE,
// DO_TYPE: a.DO_TYPE,
@@ -484,7 +485,8 @@
GPH_Y: selectnode.value.y,
GPH_PROP: JSON.stringify(selectnode.value.properties),
GPH_TEXT: selectnode.value.text.value,
- NEED_SETUP: 0,
+ NEED_SETUP: 'Y',
+ NEED_RESET: 'N',
// DO_TYPE: 0,
// DO_METHOD: '',
// DO_IF_PASS: '',
@@ -521,6 +523,7 @@
GPH_PROP: JSON.stringify(selectnode.value.properties),
GPH_TEXT: selectnode.value.text.value,
NEED_SETUP: _act.NEED_SETUP,
+ NEED_RESET: _act.NEED_RESET,
// DO_TYPE: _act.DO_TYPE,
// DO_METHOD: _act.DO_METHOD,
// DO_IF_PASS: _act.DO_IF_PASS,
diff --git a/types/config.d.ts b/types/config.d.ts
index c7a8e49..6993f4b 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -154,6 +154,7 @@
mapKey: string;
downloadUrl: string;
useOrg: boolean;
+ systemType: string;
}
export interface GlobEnvConfig {
// Site title
@@ -169,4 +170,5 @@
VITE_GLOB_MAP_KEY: string;
VITE_GLOB_DOWNLOAD_URL: string;
VITE_USE_ORG: boolean;
+ VITE_APP_TYPE: string;
}
diff --git a/types/global.d.ts b/types/global.d.ts
index 301c19a..850f933 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -1,3 +1,11 @@
+/*
+ * @Description: file content
+ * @Author: Ben Lin
+ * @version:
+ * @Date: 2024-06-18 15:09:48
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-07-19 17:09:40
+ */
import type {
ComponentRenderProxy,
VNode,
@@ -67,6 +75,7 @@
VITE_USE_MOCK: boolean;
VITE_PUBLIC_PATH: string;
VITE_GLOB_APP_TITLE: string;
+ VITE_APP_TYPE: string;
VITE_BUILD_COMPRESS: 'gzip' | 'brotli' | 'none';
}
--
Gitblit v1.9.3