From 98e08f1a23f702c7c57972e08c7abc4f37ec6aa4 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 30 Mar 2026 13:45:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=8F=8A=E4=BF=AE=E6=94=B9dictag=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/DictTag/src/DictTag.vue | 6 ++++--
src/views/erp/component/product/index.vue | 2 +-
src/views/erp/moldlist/index.vue | 2 +-
src/views/mes/dvrepair/index.vue | 14 +++++++-------
src/views/mes/task/index.vue | 2 +-
src/views/mes/taskManagement/index.vue | 2 +-
src/views/mes/zjTask/index.vue | 6 +++---
src/views/mold/moldrepair/index.vue | 4 ++--
src/views/mold/taskConfiguration/index.vue | 2 +-
src/views/mold/workOrderInquiry/index.vue | 2 +-
10 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
index 6414eaab..7f3b0213 100644
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@@ -4,7 +4,8 @@ import { isHexColor } from '@/utils/color'
import { ElTag } from 'element-plus'
import { DictDataType, getDictOptions } from '@/utils/dict'
import { isArray, isBoolean, isNumber, isString } from '@/utils/is'
-
+import {useLocaleStoreWithOut} from "@/store/modules/locale";
+const localeStore = useLocaleStoreWithOut()
export default defineComponent({
name: 'DictTag',
props: {
@@ -68,6 +69,7 @@ export default defineComponent({
if (dict.colorType + '' === 'primary' || dict.colorType + '' === 'default') {
dict.colorType = ''
}
+ const label = localeStore.getCurrentLocale?.lang === 'en' ? (dict.labelEn || dict.label) : dict.label
return (
// 添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题
- {dict?.label}
+ {label}
)
}
diff --git a/src/views/erp/component/product/index.vue b/src/views/erp/component/product/index.vue
index 2331fb01..24c6ee75 100644
--- a/src/views/erp/component/product/index.vue
+++ b/src/views/erp/component/product/index.vue
@@ -55,7 +55,7 @@
-
+
diff --git a/src/views/erp/moldlist/index.vue b/src/views/erp/moldlist/index.vue
index e15b8a17..49b265bc 100644
--- a/src/views/erp/moldlist/index.vue
+++ b/src/views/erp/moldlist/index.vue
@@ -54,7 +54,7 @@ type="success" plain @click="handleExport" :loading="exportLoading"
-
+
diff --git a/src/views/mes/dvrepair/index.vue b/src/views/mes/dvrepair/index.vue
index d0133fca..7c9a1dc3 100644
--- a/src/views/mes/dvrepair/index.vue
+++ b/src/views/mes/dvrepair/index.vue
@@ -111,11 +111,11 @@
:show-overflow-tooltip="true"
row-key="id"
@selection-change="handleSelectionChange">
-
-
+
+
-
-
+
+
@@ -141,9 +141,9 @@
prop="confirmDate"
:formatter="dateFormatter2"
width="110px" sortable />
-
-
-
+
+
+
diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue
index 966bac6b..937cea2a 100644
--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@@ -107,7 +107,7 @@
highlight-current-row
@current-change="handleCurrentChange"
>
-
+
diff --git a/src/views/mes/taskManagement/index.vue b/src/views/mes/taskManagement/index.vue
index 4fa3c45c..6b492120 100644
--- a/src/views/mes/taskManagement/index.vue
+++ b/src/views/mes/taskManagement/index.vue
@@ -84,7 +84,7 @@
:label="t('EquipmentManagement.TaskManagement.name')"
align="center"
prop="name"
- min-width="140"
+ min-width="200"
sortable />
-->
-
+
-
+
@@ -128,7 +128,7 @@ type="success" plain @click="handleExport" :loading="exportLoading"
-
+
-
+
{{ scope.row.moldName ?? scope.row.machineryName ?? '-' }}
-
+
{{ scope.row.moldCode ?? scope.row.machineryCode ?? '-' }}
diff --git a/src/views/mold/taskConfiguration/index.vue b/src/views/mold/taskConfiguration/index.vue
index 07624bc4..00a2df8d 100644
--- a/src/views/mold/taskConfiguration/index.vue
+++ b/src/views/mold/taskConfiguration/index.vue
@@ -69,7 +69,7 @@
>
-
+
{{ t('EquipmentManagement.TaskManagement.taskTypeInspect') }}
diff --git a/src/views/mold/workOrderInquiry/index.vue b/src/views/mold/workOrderInquiry/index.vue
index a53e6f70..a0fb91e7 100644
--- a/src/views/mold/workOrderInquiry/index.vue
+++ b/src/views/mold/workOrderInquiry/index.vue
@@ -69,7 +69,7 @@
-
+
{{ t('MoldManagement.MoldWorkOrderInquiry.planTypeInspect') }}
From f8c3516604b6eb3fef2e652c90a2f881e6604d64 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 30 Mar 2026 14:37:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/erp/autocode/AutocodeIndex.vue | 4 ++--
src/views/erp/component/record/index.vue | 2 +-
src/views/mes/dvsubject/index.vue | 2 +-
src/views/mes/esopFile/index.vue | 6 +++---
src/views/mes/feedingrecord/index.vue | 4 ++--
src/views/mes/moldoperate/index.vue | 2 +-
src/views/mes/taskManagement/index.vue | 4 ++--
src/views/mold/inspectionItems/index.vue | 2 +-
src/views/system/user/index.vue | 1 +
9 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/views/erp/autocode/AutocodeIndex.vue b/src/views/erp/autocode/AutocodeIndex.vue
index d3e06ba6..1154d1e6 100644
--- a/src/views/erp/autocode/AutocodeIndex.vue
+++ b/src/views/erp/autocode/AutocodeIndex.vue
@@ -98,8 +98,8 @@
-
-
+
+
{{ getBarcodeTypeLabel(scope.row.barcodeType) }}
diff --git a/src/views/erp/component/record/index.vue b/src/views/erp/component/record/index.vue
index a5421ee5..002fc2af 100644
--- a/src/views/erp/component/record/index.vue
+++ b/src/views/erp/component/record/index.vue
@@ -91,7 +91,7 @@
-
+
diff --git a/src/views/mes/dvsubject/index.vue b/src/views/mes/dvsubject/index.vue
index 841d88e7..0c99041b 100644
--- a/src/views/mes/dvsubject/index.vue
+++ b/src/views/mes/dvsubject/index.vue
@@ -92,7 +92,7 @@ effect="light" :type="getTagType('value_types', scope.row.valueType)"
-
+
diff --git a/src/views/mes/esopFile/index.vue b/src/views/mes/esopFile/index.vue
index 58db566e..f848486a 100644
--- a/src/views/mes/esopFile/index.vue
+++ b/src/views/mes/esopFile/index.vue
@@ -68,13 +68,13 @@
-
-
+
+
-
+
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index f5dde5ae..459801d6 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -102,8 +102,8 @@
-
-
+
+
diff --git a/src/views/mes/moldoperate/index.vue b/src/views/mes/moldoperate/index.vue
index c4867557..012c4014 100644
--- a/src/views/mes/moldoperate/index.vue
+++ b/src/views/mes/moldoperate/index.vue
@@ -87,7 +87,7 @@
-
+
diff --git a/src/views/mes/taskManagement/index.vue b/src/views/mes/taskManagement/index.vue
index 6b492120..b3f2246c 100644
--- a/src/views/mes/taskManagement/index.vue
+++ b/src/views/mes/taskManagement/index.vue
@@ -106,7 +106,7 @@
:label="t('EquipmentManagement.TaskManagement.projectForm')"
align="center"
prop="projectFormName"
- min-width="140"
+ min-width="300"
sortable />
-
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f3a541a9..38623086 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -118,6 +118,7 @@
align="center"
key="deptName"
prop="deptName"
+ width="200px"
:show-overflow-tooltip="true"
sortable />
From f3443fd186270f1c90f616a9294ff3cc26f5baaa Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Tue, 31 Mar 2026 09:14:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A7=E5=B1=8F?=
=?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=B7=AF=E7=94=B1=E4=B8=8D=E9=87=8D?=
=?UTF-8?q?=E5=AE=9A=E5=90=91=E7=99=BD=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/permission.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/permission.ts b/src/permission.ts
index 8201e1d6..427ae0a1 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -79,7 +79,9 @@ const whiteList = [
'/auth-redirect',
'/bind',
'/register',
- '/oauthLogin/gitee'
+ '/oauthLogin/gitee',
+ '/iot/report/dashboardPage/Dashboard8',
+ '/iot/report/dashboardPage/Dashboard1'
]
// 路由加载前
From 1f85c45a1c86e729ec0bbea54945c9bccce9c9b8 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Tue, 31 Mar 2026 10:47:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dashboard8/components/DashboardHeader.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue b/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue
index 33884766..f7a7017b 100644
--- a/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue
+++ b/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue
@@ -11,10 +11,11 @@