首页中英文切换及增加字段

src/locales/en.ts

@@ -542,6 +542,43 @@ export default {
     large: 'Large',
     small: 'Small'
   },
+  home:{
+    welcome: 'Welcome to use the Bishuo Digital Intelligent Central Control Platform',
+    message: 'The Bishuo Digital Intelligent Central Control Platform takes production operation as the core, uniformly integrating key business modules such as production planning, data collection, warehousing, equipment, energy, molds, quality, formulas and report analysis, to achieve full-process digital management from planning to execution, from equipment to products, and from data to decision-making.',
+    productTitle:'Overall production overview',
+    placeholderCreateTimeStart: 'Start Date',
+    placeholderCreateTimeEnd: 'End Date',
+    productionSchedule:'Real-time production progress',
+    productionPlan:'Production plan',
+    productionName:'Production name',
+    planNumber:'Plan quantity',
+    productionLine:'Production line',
+    planStartTime:'Plan start time',
+    planEndTime:'Plan end time',
+    completedQuantity:'Completed quantity',
+    qualifiedQuantity:'Qualified quantity',
+    unqualifiedQuantity:'Unqualified quantity',
+    yieldRate: 'YIELD',
+    actualEndTime:'Actual end time',
+    gtasks: 'Gtask',
+    missionNumber:'Mission number',
+    taskType:'Task type',
+    target:'Target',
+    creationTime:'Creation time',
+    equipment:'Equipment',
+    mould:'Mould',
+    equipmentTile:'Overall condition of the collection equipment',
+    equipmentCount:'Total equipment count',
+    operation:'Operation',
+    standbyMode:'Standby mode',
+    malfunction:'During the malfunction',
+    alerting:'Alerting...',
+    useRatio:'use ratio',
+    failureRate:'failure rate',
+    equipmentTitle:'Statistics of equipment maintenance quantities',
+    equipmentClass:'Equipment classification statistics',
+    equipmentMessage:'Classify and count by mold type, and select the top 10 items with the largest number of molds.',
+  },
   login: {
     welcome: 'Welcome to the system',
     message: 'Backstage management system',
@@ -892,6 +929,7 @@ export default {
   SystemManagement: {
     Dept: {
       name: 'Department Name',
+      enName: 'Department Name (en)',
       statusLabel: 'Department Status',
       status: 'Status',
       leader: 'Leader',
@@ -1079,6 +1117,7 @@ export default {
     Dict: {
       id: 'Dict ID',
       name: 'Dict Name',
+      enName: 'Dict Name (en)',
       type: 'Dict Type',
       label: 'Dict Label',
       labelEn: 'Dict Label (EN)',
@@ -1097,6 +1136,7 @@ export default {
       searchLabelPlaceholder: 'Please input dict label',
       searchDataStatusPlaceholder: 'Please select data status',
       namePlaceholder: 'Please input dict name',
+      enNamePlaceholder: 'Please input dict name (en)',
       typePlaceholder: 'Please input dict type',
       labelPlaceholder: 'Please input data label',
       labelEnPlaceholder: 'Please input data label (EN)',

src/locales/zh-CN.ts

@@ -543,6 +543,43 @@ export default {
     large: '大',
     small: '小'
   },
+  home: {
+    welcome: '欢迎您使用必硕数字化智能中控平台',
+    message: '必硕数字化智能中控平台以生产运营为核心，统一整合生产计划、数据采集、仓储、设备、能源、模具、质量、配方及报表分析等关键业务模块，实现从计划到执行、从设备到制品、从数据到决策的全流程数字化管理。',
+    productTitle: '整体生产概况',
+    placeholderCreateTimeStart: '开始日期',
+    placeholderCreateTimeEnd: '结束日期',
+    productionSchedule:'实时生产进度',
+    productionPlan:'生产计划',
+    productionName:'生产名称',
+    planNumber:'计划数量',
+    productionLine:'生产线',
+    planStartTime:'计划开始时间',
+    planEndTime:'计划结束时间',
+    completedQuantity:'完工数量',
+    qualifiedQuantity:'合格数量',
+    unqualifiedQuantity:'不合格数量',
+    yieldRate:'合格率',
+    actualEndTime:'实际结束时间',
+    gtasks:'待办任务',
+    missionNumber:'任务编号',
+    taskType:'任务类型',
+    target:'任务目标',
+    creationTime:'创建时间',
+    equipment:'设备',
+    mould:'模具',
+    equipmentTile:'采集设备整体情况',
+    equipmentCount:'设备总数',
+    operation:'运行',
+    standbyMode:'待机',
+    malfunction:'故障中',
+    alerting:'报警中',
+    useRatio:'利用率',
+    failureRate:'故障率',
+    equipmentTitle:'设备维修数量统计',
+    equipmentClass:'设备分类统计',
+    equipmentMessage:'按模具分类统计，取模具数量最多的前10项'
+  },
   login: {
     welcome: '欢迎使用必硕数字化智能中控平台',
     message: '必硕智能“纸”为绿色生活',
@@ -1079,6 +1116,7 @@ export default {
     Dict: {
       id: '字典编号',
       name: '字典名称',
+      enName: '字典英文名称',
       type: '字典类型',
       label: '字典标签',
       labelEn: '字典标签(英文)',
@@ -1097,6 +1135,7 @@ export default {
       searchLabelPlaceholder: '请输入字典标签',
       searchDataStatusPlaceholder: '请选择数据状态',
       namePlaceholder: '请输入字典名称',
+      enNamePlaceholder: '请输入字典英文名称',
       typePlaceholder: '请输入字典类型',
       labelPlaceholder: '请输入数据标签',
       labelEnPlaceholder: '请输入数据标签(英文)',

src/views/Home/Index.vue

@@ -2,9 +2,9 @@
 	<div class="home-page">
 		<div class="home-welcome">
 			<div class="home-welcome-left">
-				<div class="home-welcome-title text-white!">欢迎您使用必硕数字化智能中控平台</div>
+				<div class="home-welcome-title text-white!">{{t("home.welcome")}}</div>
 				<div class="home-welcome-desc text-white! opacity-80">
-					必硕数字化智能中控平台以生产运营为核心，统一整合生产计划、数据采集、仓储、设备、能源、模具、质量、配方及报表分析等关键业务模块，实现从计划到执行、从设备到制品、从数据到决策的全流程数字化管理。
+					{{t("home.message")}}
 				</div>
 			</div>
 			<div class="home-welcome-right">
@@ -15,11 +15,11 @@ alt="banner" :src="bannerImg" fit="contain" class="home-welcome-image"
 		</div>
 		<el-card shadow="never" class="home-section">
 			<div class="section-header">
-				<div class="section-title">整体生产概况</div>
+				<div class="section-title">{{t("home.productTitle")}}</div>
 				<div>
 					<el-date-picker
 v-model="productionOverviewRange" type="daterange" unlink-panels value-format="YYYY-MM-DD"
-						start-placeholder="开始日期" end-placeholder="结束日期" size="small" @change="handleProductionOverviewRangeChange" />
+						:start-placeholder="t('home.placeholderCreateTimeStart')" :end-placeholder="t('home.placeholderCreateTimeEnd')" size="small" @change="handleProductionOverviewRangeChange" />
 				</div>
 			</div>
 			<el-row class="production-overview-row" :gutter="0">
@@ -45,14 +45,14 @@ v-model="productionOverviewRange" type="daterange" unlink-panels value-format="Y
 		</el-card>
 		<el-card shadow="never" class="home-section">
 			<div class="section-header">
-				<div class="section-title">实时生产进度</div>
+				<div class="section-title">{{t("home.productionSchedule")}}</div>
 			</div>
 			<el-carousel height="190px" arrow="always" indicator-position="none" :interval="15000" class="progress-carousel">
 				<el-carousel-item v-for="(group, index) in productionProgressGroups" :key="index">
 					<el-row :gutter="16">
 					<el-col  v-for="item in group" :key="item.id" :xl="8" :lg="8" :md="8" :sm="12" :xs="24">
 							<div class="progress-card">
-								<div class="progress-card-header">生产计划 {{ item.code }}
+								<div class="progress-card-header">{{t("home.productionPlan")}} {{ item.code }}
 									<el-tag  :type="getPlanStatusTagType(item.status)" effect="light">
             {{ getPlanStatusLabel(item.status) }}
           </el-tag>
@@ -60,45 +60,45 @@ v-model="productionOverviewRange" type="daterange" unlink-panels value-format="Y
 								<div class="progress-card-body">
 									<div class="progress-col">
 										<div class="progress-row">
-											<span class="progress-label">产品名称</span>
+											<span class="progress-label">{{t("home.productionName")}}</span>
 											<span class="progress-value">{{ item.productName }}</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">计划数量</span>
+											<span class="progress-label">{{t("home.planNumber")}}</span>
 											<span class="progress-value">{{ item.planNumber }}</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">生产线</span>
+											<span class="progress-label">{{t("home.productionLine")}}</span>
 											<span class="progress-value">{{ item.feedingPipelineName }}</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">计划开始时间</span>
+											<span class="progress-label">{{t("home.planStartTime")}}</span>
 											<span class="progress-value">{{ formatDate(item.planStartTime) }}</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">计划结束时间</span>
+											<span class="progress-label">{{t("home.planEndTime")}}</span>
 											<span class="progress-value">{{ formatDate(item.planEndTime) }}</span>
 										</div>
 									</div>
 									<div class="progress-col">
 										<div class="progress-row">
-											<span class="progress-label">完工数量</span>
+											<span class="progress-label">{{t("home.completedQuantity")}}</span>
 											<span class="progress-value">{{ item.wangongNumber }}</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">合格数量</span>
+											<span class="progress-label">{{t("home.qualifiedQuantity")}}</span>
 											<span class="progress-value">{{ item.passNumber }}</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">不合格数量</span>
+											<span class="progress-label">{{t("home.unqualifiedQuantity")}}</span>
 											<span class="progress-value">{{ item.noPassNumber }}%</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">合格率</span>
+											<span class="progress-label">{{t("home.yieldRate")}}</span>
 											<span class="progress-value">{{ item.passRate }}</span>
 										</div>
 										<div class="progress-row">
-											<span class="progress-label">实际结束时间</span>
+											<span class="progress-label">{{t("home.actualEndTime")}}</span>
 											<span class="progress-value">{{ formatDate(item.endTime) }}</span>
 										</div>
 									</div>
@@ -111,7 +111,7 @@ v-model="productionOverviewRange" type="daterange" unlink-panels value-format="Y
 		</el-card>
 				<el-card shadow="never" class="home-section">
 			<div class="section-header">
-				<div class="section-title">待办任务</div>
+				<div class="section-title">{{t("home.gtasks")}}</div>
 			</div>
 			<el-carousel height="160px" arrow="always" indicator-position="none" class="todo-carousel" :interval="15000">
 				<el-carousel-item v-for="(group, index) in todoTaskGroups" :key="index">
@@ -119,10 +119,10 @@ v-model="productionOverviewRange" type="daterange" unlink-panels value-format="Y
 						<el-col v-for="item in group" :key="item.id" :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
 							<div class="todo-card">
 								<div class="todo-title">{{ item.name }}</div>
-								<div class="todo-sub">任务编号：{{ item.code }}</div>
+								<div class="todo-sub">{{t("home.missionNumber")}}：{{ item.code }}</div>
-								<div class="todo-sub">任务类型：{{ item.type }}</div>
+								<div class="todo-sub">{{t("home.taskType")}}：{{ item.type }}</div>
-								<div class="todo-sub">目标：{{ item.deviceName }}</div>
+								<div class="todo-sub">{{t("home.target")}}：{{ item.deviceName }}</div>
-								<div class="todo-sub">创建时间：{{ formatDate(item.createTime) }}</div>
+								<div class="todo-sub">{{t("home.creationTime")}}：{{ formatDate(item.createTime) }}</div>
 							</div>
 						</el-col>
 					</el-row>
@@ -133,7 +133,7 @@ v-model="productionOverviewRange" type="daterange" unlink-panels value-format="Y
 			<el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24" class="device-alarm-col">
 				<el-card shadow="never" class="device-alarm-card">
 					<div class="section-header">
-						<div class="section-title">设备</div>
+						<div class="section-title">{{t("home.equipment")}}</div>
 						<!-- <div class="section-actions">
 							<el-button type="default" size="small">查看文档</el-button>
 							<el-button type="primary" size="small">添加设备</el-button>
@@ -152,7 +152,7 @@ v-model="productionOverviewRange" type="daterange" unlink-panels value-format="Y
 			<el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24" class="device-alarm-col mt-16px xl:mt-0 lg:mt-0">
 				<el-card shadow="never" class="device-alarm-card">
 					<div class="section-header">
-						<div class="section-title">模具</div>
+						<div class="section-title">{{t("home.mould")}}</div>
 					</div>
 					<el-row :gutter="12" class="mt-16px">
 						<el-col v-for="item in moldStatusCards" :key="item.key" :span="8">
@@ -167,7 +167,7 @@ v-model="productionOverviewRange" type="daterange" unlink-panels value-format="Y
 		</el-row>
 		<el-card shadow="never" class="home-section">
 			<div class="section-header">
-				<div class="section-title">采集设备整体情况</div>
+				<div class="section-title">{{t("home.equipmentTile")}}</div>
 				<!-- <div>
 					<el-date-picker
 v-model="deviceOverviewRange" type="daterange" unlink-panels value-format="YYYY-MM-DD"
@@ -177,43 +177,43 @@ v-model="deviceOverviewRange" type="daterange" unlink-panels value-format="YYYY-
 			<el-row class="device-overview-row" :gutter="0" v-model = "formData">
 				<el-col :span="2">
 					<div class="device-overview-item">
-						<div class="production-overview-label">总设备数</div>
+						<div class="production-overview-label">{{t("home.equipmentCount")}}</div>
 						<div class="production-overview-value production-overview-value-primary">{{ formData?.totalDevices }}</div>
 					</div>
 				</el-col>
 				<el-col :span="2">
 					<div class="device-overview-item">
-						<div class="production-overview-label">运行</div>
+						<div class="production-overview-label">{{t("home.operation")}}</div>
 						<div class="production-overview-value production-overview-value-primary">{{ formData?.runningCount }}</div>
 					</div>
 				</el-col>
 				<el-col :span="2">
 					<div class="device-overview-item">
-						<div class="production-overview-label">待机中</div>
+						<div class="production-overview-label">{{t("home.standbyMode")}}</div>
 						<div class="production-overview-value production-overview-value-primary">{{ formData?.standbyCount }}</div>
 					</div>
 				</el-col>
 				<el-col :span="2">
 					<div class="device-overview-item">
-						<div class="production-overview-label">故障中</div>
+						<div class="production-overview-label">{{t("home.malfunction")}}</div>
 						<div class="production-overview-value production-overview-value-primary">{{ formData?.faultCount }}</div>
 					</div>
 				</el-col>
 				<el-col :span="2">
 					<div class="device-overview-item">
-						<div class="production-overview-label">报警中</div>
+						<div class="production-overview-label">{{t("home.alerting")}}</div>
 						<div class="production-overview-value production-overview-value-primary">{{ formData?.warningCount }}</div>
 					</div>
 				</el-col>
 				<el-col :span="2">
 					<div class="device-overview-item">
-						<div class="production-overview-label">利用率</div>
+						<div class="production-overview-label">{{t("home.useRatio")}}</div>
 						<div class="production-overview-value production-overview-value-primary">{{ formData?.utilizationRate }}</div>
 					</div>
 				</el-col>
 				<el-col :span="2">
 					<div class="device-overview-item">
-						<div class="production-overview-label">故障率</div>
+						<div class="production-overview-label">{{t("home.failureRate")}}</div>
 						<div class="production-overview-value production-overview-value-primary">{{ formData?.faultRate }}</div>
 					</div>
 				</el-col>
@@ -224,7 +224,7 @@ v-model="deviceOverviewRange" type="daterange" unlink-panels value-format="YYYY-
 				<el-card shadow="never">
 					<template #header>
 						<div class="h-3 flex justify-between">
-							<span>设备维修数量统计</span>
+							<span>{{t("home.equipmentTitle")}}</span>
 						</div>
 					</template>
 					<Echart :options="deviceRepairLineOptions" :height="260" />
@@ -234,7 +234,7 @@ v-model="deviceOverviewRange" type="daterange" unlink-panels value-format="YYYY-
 				<el-card shadow="never">
 					<template #header>
 						<div class="h-3 flex justify-between">
-							<span>设备分类统计</span>
+							<span>{{t("home.equipmentClass")}}</span>
 						</div>
 					</template>
 					<Echart :options="deviceCategoryPieOptionsData" :height="260" />
@@ -244,7 +244,7 @@ v-model="deviceOverviewRange" type="daterange" unlink-panels value-format="YYYY-
 				<el-card shadow="never">
 					<template #header>
 						<div class="h-3 flex justify-between">
-							<span>按模具分类统计，取模具数量最多的前10项</span>
+							<span>{{t("home.equipmentMessage")}}</span>
 						</div>
 					</template>
 					<Echart :options="moldTypeBarOptionsData" :height="260" />

src/views/mes/esopFile/FileForm.vue

@@ -66,14 +66,14 @@
       :on-exceed="handleExceed"
       :on-success="submitFormSuccess"
       :http-request="httpRequest"
-      accept=".jpg, .png, .gif ,.pdf,.word,.excel,.ppt,.mp4,.avi,.mov"
+      accept=".jpg, .png, .gif ,.pdf,.word,.excel,.ppt,.pptx,.mp4,.avi,.mov"
       drag
     >
       <i class="el-icon-upload"></i>
       <div class="el-upload__text">  {{t('FactoryModeling.EsopFile.messageThree')}} <em>{{t('FactoryModeling.EsopFile.messageFour')}}</em></div>
       <template #tip>
         <div class="el-upload__tip" style="color: red">
-          {{t('FactoryModeling.EsopFile.messageOne')}} .jpg, .png, .gif ,.pdf,.word,.excel,.ppt,.mp4,.avi,.mov  {{t('FactoryModeling.EsopFile.messageTwo')}}！
+          {{t('FactoryModeling.EsopFile.messageOne')}} .jpg, .png, .gif ,.pdf,.word,.excel,.ppt,.pptx,.mp4,.avi,.mov  {{t('FactoryModeling.EsopFile.messageTwo')}}！
         </div>
       </template>
     </el-upload>

src/views/system/dict/DictTypeForm.vue

@@ -13,6 +13,12 @@
           :placeholder="t('SystemManagement.Dict.namePlaceholder')"
         />
       </el-form-item>
+      <el-form-item :label="t('SystemManagement.Dict.enName')" prop="enName">
+        <el-input
+          v-model="formData.enName"
+          :placeholder="t('SystemManagement.Dict.enNamePlaceholder')"
+        />
+      </el-form-item>
       <el-form-item :label="t('SystemManagement.Dict.type')" prop="type">
         <el-input
           v-model="formData.type"
@@ -64,6 +70,7 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   name: '',
+  enName: '',
   type: '',
   status: CommonStatusEnum.ENABLE,
   remark: ''
@@ -127,6 +134,7 @@ const resetForm = () => {
     id: undefined,
     type: '',
     name: '',
+    enName: '',
     status: CommonStatusEnum.ENABLE,
     remark: ''
   }

src/views/system/dict/index.vue

@@ -94,6 +94,12 @@
         prop="name"
         show-overflow-tooltip
        sortable />
+      <el-table-column
+        align="center"
+        :label="t('SystemManagement.Dict.enName')"
+        prop="enName"
+        show-overflow-tooltip
+        sortable />
       <el-table-column
         align="center"
         :label="t('SystemManagement.Dict.type')"

src/views/system/menu/index.vue

@@ -75,6 +75,7 @@
       row-key="id"
     >
       <el-table-column :show-overflow-tooltip="true" :label="t('SystemManagement.Menu.name')" prop="name" width="250"  sortable />
+      <el-table-column :show-overflow-tooltip="true" :label="t('SystemManagement.Menu.enName')" prop="enName" width="250"  sortable />
       <el-table-column align="center" :label="t('SystemManagement.Menu.icon')" prop="icon" width="100">
         <template #default="scope">
           <Icon :icon="scope.row.icon" />