From d171725541e30626aa501c1bed217c750df77ab4 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Tue, 10 Sep 2024 18:14:32 +0800 Subject: [PATCH] fix some thing --- src/layout/components/Footer/src/Footer.vue | 5 ++++- src/store/modules/app.ts | 5 +++++ src/utils/dict.ts | 2 +- .../purchase/return/components/PurchaseReturnItemForm.vue | 2 +- src/views/erp/sale/out/components/SaleOutItemForm.vue | 2 +- src/views/erp/sale/return/components/SaleReturnItemForm.vue | 2 +- src/views/erp/stock/check/components/StockCheckItemForm.vue | 2 +- src/views/erp/stock/in/components/StockInItemForm.vue | 2 +- src/views/erp/stock/move/components/StockMoveItemForm.vue | 2 +- src/views/erp/stock/out/components/StockOutItemForm.vue | 2 +- src/views/iot/device/components/DeviceAttributeForm.vue | 2 +- src/views/mes/stockin/components/StockInItemForm.vue | 2 +- src/views/system/loginlog/index.vue | 4 ++-- 13 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue index 5d27f8b6..15fce673 100644 --- a/src/layout/components/Footer/src/Footer.vue +++ b/src/layout/components/Footer/src/Footer.vue @@ -12,6 +12,8 @@ const prefixCls = getPrefixCls('footer') const appStore = useAppStore() const title = computed(() => appStore.getTitle) + +const docsUrl = computed(() => appStore.getDocsUrl) diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 87336181..f6698668 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -36,6 +36,7 @@ interface AppState { footer: boolean theme: ThemeTypes fixedMenu: boolean + docsUrl: string } export const useAppStore = defineStore('app', { @@ -64,6 +65,7 @@ export const useAppStore = defineStore('app', { footer: true, // 显示页脚 greyMode: false, // 是否开始灰色模式，用于特殊悼念日 fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单 + docsUrl: "http://47.106.185.127:8088/", //操作手册地址 layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局 isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式 @@ -155,6 +157,9 @@ export const useAppStore = defineStore('app', { getTitle(): string { return this.title }, + getDocsUrl(): string { + return this.docsUrl + }, getUserInfo(): string { return this.userInfo }, diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 7a3f2e2f..136f477b 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -272,6 +272,6 @@ export enum DICT_TYPE { IOT_DEVICE_DATA_TYPE = "iot_device_data_type", IOT_PROXY_SERVER_STATUS = "iot_proxy_server_status", IOT_DEVICE_USE_TYPE = "iot_device_use_type", - + IOT_ATTRIBUTE_IO_TYPE = "iot_attribute_io_type", IOT_ALERT_TYPE = "iot_alert_type", } diff --git a/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue b/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue index 2d3e8c58..d89acef2 100644 --- a/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue +++ b/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue @@ -105,7 +105,7 @@ diff --git a/src/views/erp/sale/out/components/SaleOutItemForm.vue b/src/views/erp/sale/out/components/SaleOutItemForm.vue index 15cbef05..95c593df 100644 --- a/src/views/erp/sale/out/components/SaleOutItemForm.vue +++ b/src/views/erp/sale/out/components/SaleOutItemForm.vue @@ -105,7 +105,7 @@ diff --git a/src/views/erp/sale/return/components/SaleReturnItemForm.vue b/src/views/erp/sale/return/components/SaleReturnItemForm.vue index adb9fd41..230088fd 100644 --- a/src/views/erp/sale/return/components/SaleReturnItemForm.vue +++ b/src/views/erp/sale/return/components/SaleReturnItemForm.vue @@ -105,7 +105,7 @@ diff --git a/src/views/erp/stock/check/components/StockCheckItemForm.vue b/src/views/erp/stock/check/components/StockCheckItemForm.vue index 60363114..1f730bdf 100644 --- a/src/views/erp/stock/check/components/StockCheckItemForm.vue +++ b/src/views/erp/stock/check/components/StockCheckItemForm.vue @@ -109,7 +109,7 @@ diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue index b7543dc3..35129660 100644 --- a/src/views/erp/stock/in/components/StockInItemForm.vue +++ b/src/views/erp/stock/in/components/StockInItemForm.vue @@ -94,7 +94,7 @@ diff --git a/src/views/erp/stock/move/components/StockMoveItemForm.vue b/src/views/erp/stock/move/components/StockMoveItemForm.vue index 8971956f..b1e3ed82 100644 --- a/src/views/erp/stock/move/components/StockMoveItemForm.vue +++ b/src/views/erp/stock/move/components/StockMoveItemForm.vue @@ -117,7 +117,7 @@ diff --git a/src/views/erp/stock/out/components/StockOutItemForm.vue b/src/views/erp/stock/out/components/StockOutItemForm.vue index eb6e1c57..e8c4332b 100644 --- a/src/views/erp/stock/out/components/StockOutItemForm.vue +++ b/src/views/erp/stock/out/components/StockOutItemForm.vue @@ -94,7 +94,7 @@ diff --git a/src/views/iot/device/components/DeviceAttributeForm.vue b/src/views/iot/device/components/DeviceAttributeForm.vue index c5470945..983dbad2 100644 --- a/src/views/iot/device/components/DeviceAttributeForm.vue +++ b/src/views/iot/device/components/DeviceAttributeForm.vue @@ -186,4 +186,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - \ No newline at end of file + diff --git a/src/views/mes/stockin/components/StockInItemForm.vue b/src/views/mes/stockin/components/StockInItemForm.vue index a8284875..3dcbd568 100644 --- a/src/views/mes/stockin/components/StockInItemForm.vue +++ b/src/views/mes/stockin/components/StockInItemForm.vue @@ -93,7 +93,7 @@ diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue index 61c820c6..45053592 100644 --- a/src/views/system/loginlog/index.vue +++ b/src/views/system/loginlog/index.vue @@ -63,9 +63,9 @@ - + - +