字典国际化，国际化整理，部分样式修改

ruoyi-ui/src/components/DictData/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import store from '@/store'
 import DataDict from '@/utils/dict'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import i18n from "@/lang";
 
 function searchDictByKey(dict, key) {
   if (key == null && key == "") {
@@ -31,8 +32,15 @@ function install() {
           } else {
             return new Promise((resolve, reject) => {
               getDicts(dictMeta.type).then(res => {
-                store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
+                // store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
-                resolve(res.data)
+                // resolve(res.data)
+                const translatedData = res.data.map(item => ({
+                  ...item,
+                  dictLabel: i18n.t(item.dictLabel) || item.dictLabel
+                }))
+                //console.log(translatedData)
+                store.dispatch('dict/setDict', { key: dictMeta.type, value: translatedData })
+                resolve(translatedData)
               }).catch(error => {
                 reject(error)
               })
@@ -46,4 +54,4 @@ function install() {
 
 export default {
   install,
-}
+}

ruoyi-ui/src/lang/zh.js

@@ -31,7 +31,7 @@ export default {
       dialog: {
         add: '添加输送机',
         edit: '修改输送机',
-        delete: '是否确认删除输送机编号为"{0}"的数据项？'
+        deleteConfirm: '是否确认删除输送机编号为"{0}"的数据项？'
       }
     },
     car: {
@@ -222,47 +222,13 @@ export default {
       }
     },
     home:'首页',
-    InboundManagement: "入库管理",
-    //收货单据新增
-    ReceivingDocumentsAdd: '收货单据新增',
-    ReceiptDocumentManagement: "收货单据管理",
-    ManagementOfInboundDocuments: "入库单据管理",
-    InboundTaskManagement: "入库作业管理",
-
-    //********************基础信息********************
-    //容器管理
-    ContainerManagement: '容器管理',
-
-    //********************仓库管理********************
-    WarehouseManagement: '仓库管理',
-    //仓库（库区）管理
-    WarehouseAreaManagement: '库区管理',
-    //货位管理
-    CargoSpaceManagement: '货位管理',
-
-    //********************出库管理********************
-    outboundManagement: '出库管理',
-    createNewOutboundDocument: '新建出库单据',
-    outboundDocumentManagement: '出库单据管理',
-    outboundTaskManagement: '出库作业管理',
-
-    //********************KPI分析********************
-    KPIAnalysis: 'KPI分析',
-    // 入库分析
-    KPIAnalysis_StockIn: '入库分析',
-    // 出库分析
-    KPIAnalysis_StockOut: '出库分析',
-    // 巷道分布
-    KPIAnalysis_Roadway: '巷道分布',
-    // 货位分析
-    KPIAnalysis_CargoSpace: '货位分析',
-    // 库存平面图
-    KPIAnalysis_CargoPlan: '库存平面图',
 
     //********************系统监控********************
     SystemMonitor: '系统监控',
     // 在线用户
     SystemMonitor_Online: '在线用户',
+    //接口记录
+    api: '接口记录',
     // 定时任务
     SystemMonitor_ScheduledTask: '定时任务',
     // 数据监控
@@ -298,38 +264,6 @@ export default {
     LogManagement_OperationLog: '操作日志',
     //登录日志
     LogManagement_LoginLog: '操作日志',
-
-
-    // ****************盘点管理******************
-    inventoryManagement: '盘点管理',
-    createNewInventoryDocument: '新建盘点单据',
-    inventoryDocumentManagement: '盘点单据管理',
-    inventoryStorageTask: '盘点入库作业',
-    inventoryOutboundTask: '盘点出库作业',
-    inventoryDiscrepancyManagement: '盘点差异管理',
-    // ****************库存管理******************
-    stockManagement: '库存管理',
-    stockInformation: '库存信息',
-    stockOperationRecords: '库存操作记录',
-    stockFreezeRecord: '库存冻结记录',
-    // ***************基础信息****************
-    basicInformation: '基础信息',
-    customerManagement: '客户管理',
-    supplierManagement: '供应商管理',
-    materialManagement: '物料管理',
-    basicPointLocation: '基础点位',
-    //*************** 查询统计*************
-    queryStatistics: '查询统计',
-    inventoryDetailQuery: '库存明细查询',
-    inventorySummaryQuery: '库存汇总查询',
-    inboundDocumentHistory: '入库单据历史',
-    outboundDocumentHistory: '出库单据历史',
-    inboundTaskFlow: '入库作业流水',
-    outboundTaskFlow: '出库作业流水',
-    flatInventoryFlow: '平库入库流水',
-    flatOutboundFlow: '平库出库流水',
-    safetyStockInquiry: '安全库存查询',
-    warningInventoryInquiry: '库存预警报表',
     userManagement: {
       userQuery: ' 用户查询 ',
       userAdd: ' 用户新增 ',
@@ -416,257 +350,6 @@ export default {
       importCode: ' 导入代码 ',
       previewCode: ' 预览代码 ',
       generateCode: ' 生成代码 '
-    },
-    outboundMainOrderManagement: {
-      outboundMainOrderQuery: ' 出库主单查询 ',
-      outboundMainOrderAdd: ' 出库主单新增 ',
-      outboundMainOrderModify: ' 出库主单修改 ',
-      outboundMainOrderDelete: ' 出库主单删除 ',
-      outboundMainOrderExport: ' 出库主单导出 ',
-      documentStatusModify: ' 单据状态修改 ',
-      autoAllocate: ' 自动分配 ',
-      manualAllocate: ' 手动分配 '
-    },
-    customerManagementInfo: {
-      customerQuery: ' 客户管理查询 ',
-      customerAdd: ' 客户管理新增 ',
-      customerModify: ' 客户管理修改 ',
-      customerDelete: ' 客户管理删除 ',
-      customerExport: ' 客户管理导出 '
-    },
-    inboundDocumentManagement: {
-      inboundDocumentQuery: ' 入库单据查询 ',
-      inboundDocumentAdd: ' 入库单据新增 ',
-      inboundDocumentStatusModify: ' 入库单据状态修改 ',
-      inboundDocumentDelete: ' 入库单据删除 ',
-      inboundDocumentExport: ' 入库单据导出 '
-    },
-    outboundSubOrderManagement: {
-      outboundSubOrderQuery: ' 出库子单查询 ',
-      outboundSubOrderAdd: ' 出库子单新增 ',
-      outboundSubOrderModify: ' 出库子单修改 ',
-      outboundSubOrderDelete: ' 出库子单删除 ',
-      outboundSubOrderExport: ' 出库子单导出 '
-    },
-    supplierManagementInfo: {
-      supplierQuery: ' 供应商管理查询 ',
-      supplierAdd: ' 供应商管理新增 ',
-      supplierModify: ' 供应商管理修改 ',
-      supplierDelete: ' 供应商管理删除 ',
-      supplierExport: ' 供应商管理导出 '
-    },
-    receivingDocumentManagement: {
-      receivingDocumentQuery: ' 收货单据查询 ',
-      receivingDocumentAdd: ' 收货单据新增 ',
-      receivingDocumentModify: ' 收货单据修改 ',
-      receivingDocumentDelete: ' 收货单据删除 ',
-      receivingDocumentExport: ' 收货单据导出 ',
-      deleteReceivingSubDocument: ' 删除收货子单据 ',
-      addInboundDocument: ' 新增入库单据 ',
-      qualityInspectionButton: ' 质检按钮 '
-    },
-    materialManagementInfo: {
-      materialQuery: ' 物料管理查询 ',
-      materialAdd: ' 物料管理新增 ',
-      materialModify: ' 物料管理修改 ',
-      materialDelete: ' 物料管理删除 ',
-      materialExport: ' 物料管理导出 '
-    },
-    selfBuiltReceivingDocument: {
-      selfBuiltReceivingDocument: ' 自建收货单据 ',
-      importMaterial: ' 导入物料 '
-    },
-    warehouseAreaManagement: {
-      warehouseAreaQuery: ' 库区管理查询 ',
-      warehouseAreaAdd: ' 库区管理新增 ',
-      warehouseAreaModify: ' 库区管理更改 ',
-      warehouseAreaDelete: ' 库区管理移除 ',
-      warehouseAreaExport: ' 库区管理导出 '
-    },
-    locationManagement: {
-      locationQuery: ' 货位管理查询 ',
-      locationAdd: ' 货位管理新增 ',
-      locationModify: ' 货位管理更改 ',
-      locationDelete: ' 货位管理移除 ',
-      locationExport: ' 货位管理导出 '
-    },
-    stockGoodsAvailableForOutbound: {
-      availableStockGoods: ' 可出库的库存物资信息 ',
-      saveDocument: ' 保存单据 '
-    },
-    availableStockGoodsQuery: {
-      availableStockGoodsQuery: ' 可出库的库存物资信息查询 ',
-      availableStockGoodsExport: ' 可出库的库存物资信息导出 '
-    },
-    taskTableManagement: {
-      taskTableQuery: ' 任务表查询 ',
-      taskTableAdd: ' 任务表新增 ',
-      taskTableModify: ' 任务表修改 ',
-      taskTableDelete: ' 任务表删除 ',
-      taskTableExport: ' 任务表导出 ',
-      manualAbandon: ' 手动作废 ',
-      manualComplete: ' 手动完成 '
-    },
-    inventoryInformationManagement: {
-      inventoryQuery: ' 库存信息查询 ',
-      inventoryAdd: ' 库存信息新增 ',
-      inventoryModify: ' 库存信息修改 ',
-      inventoryDelete: ' 库存信息删除 ',
-      inventoryExport: ' 库存信息导出 '
-    },
-    inventoryOperationRecordManagement: {
-      inventoryOperationRecordQuery: ' 库存操作记录查询 ',
-      inventoryOperationRecordAdd: ' 库存操作记录新增 ',
-      inventoryOperationRecordModify: ' 库存操作记录修改 ',
-      inventoryOperationRecordDelete: ' 库存操作记录删除 ',
-      inventoryOperationRecordExport: ' 库存操作记录导出 '
-    },
-    inventoryFreezeRecordManagement: {
-      inventoryFreezeRecordQuery: ' 库存冻结记录查询 ',
-      inventoryFreezeRecordAdd: ' 库存冻结记录新增 ',
-      inventoryFreezeRecordModify: ' 库存冻结记录修改 ',
-      inventoryFreezeRecordDelete: ' 库存冻结记录删除 ',
-      inventoryFreezeRecordExport: ' 库存冻结记录导出 '
-    },
-    inboundDocumentHistoryInfo: {
-      inboundDocumentHistoryQuery: ' 入库单据历史查询 ',
-      inboundDocumentHistoryExport: ' 入库单据历史导出 '
-    },
-    inventoryDetailQueryInfo: {
-      inventoryDetailQuery: ' 库存明细查询查询 ',
-      inventoryDetailExport: ' 库存明细查询导出 '
-    },
-    inventorySummaryQueryInfo: {
-      inventorySummaryQuery: ' 库存汇总查询查询 ',
-      inventorySummaryExport: ' 库存汇总查询导出 '
-    },
-    outboundDocumentHistoryInfo: {
-      outboundDocumentHistoryQuery: ' 出库单据历史查询 ',
-      outboundDocumentHistoryExport: ' 出库单据历史导出 '
-    },
-    inventoryCheckDifference: {
-      inventoryCheckDifferenceQuery: ' 盘点差异查询 ',
-      inventoryCheckDifferenceAdd: ' 盘点差异新增 ',
-      inventoryCheckDifferenceModify: ' 盘点差异修改 ',
-      inventoryCheckDifferenceDelete: ' 盘点差异删除 ',
-      inventoryCheckDifferenceExport: ' 盘点差异导出 ',
-      approvalButton: ' 审核按钮 ',
-      approvalReject: ' 审核不通过 '
-    },
-    inboundOperationFlow: {
-      inboundOperationFlowQuery: ' 入库作业流水查询 ',
-      inboundOperationFlowExport: ' 入库作业流水导出 '
-    },
-    outboundOperationFlow: {
-      outboundOperationFlowQuery: ' 出库作业流水查询 ',
-      outboundOperationFlowExport: ' 出库作业流水导出 '
-    },
-    inventoryCheckDocument: {
-      inventoryCheckDocumentQuery: ' 盘库单据主信息查询 ',
-      inventoryCheckDocumentAdd: ' 盘库单据主信息新增 ',
-      inventoryCheckDocumentModify: ' 盘库单据主信息修改 ',
-      inventoryCheckDocumentDelete: ' 盘库单据主信息删除 ',
-      inventoryCheckDocumentExport: ' 盘库单据主信息导出 ',
-      autoAllocate: ' 自动分配 '
-    },
-    flatWarehouseInboundFlow: {
-      flatWarehouseInboundFlowQuery: ' 平库入库流水查询 ',
-      flatWarehouseInboundFlowExport: ' 平库入库流水导出 '
-    },
-    flatWarehouseOutboundFlow: {
-      flatWarehouseOutboundFlowQuery: ' 平库出库流水查询 ',
-      flatWarehouseOutboundFlowExport: ' 平库出库流水导出 '
-    },
-    basicPointManagement: {
-      basicPointQuery: ' 基础点位查询 ',
-      basicPointAdd: ' 基础点位新增 ',
-      basicPointModify: ' 基础点位修改 ',
-      basicPointDelete: ' 基础点位删除 ',
-      basicPointExport: ' 基础点位导出 ',
-      bindMaterial: ' 绑定物料 ',
-      bindMaterialButton: ' 绑定物料按钮 ',
-      unbindMaterial: ' 解绑物料 '
-    },
-    safetyStockQuery: {
-      safetyStockQuery: ' 安全库存查询查询 ',
-      safetyStockExport: ' 安全库存查询导出 '
-    },
-    warningStockQuery: {
-      warningStockQuery: ' 预警库存查询查询 ',
-      warningStockExport: ' 预警库存查询导出 '
-    },
-    taskCompletionManagement: {
-      manualComplete: ' 手动完成 ',
-      manualAbandon: ' 手动作废 '
-    },
-    documentOperation: {
-      saveDocument: ' 保存单据 ',
-      selectMaterial: ' 选择物资 '
-    },
-    taskStatusManagement: {
-      manualAbandon: ' 手动作废 ',
-      manualComplete: ' 手动完成 '
-    },
-    warehouseInOutManagement: {
-      warehouseInOutQuery: ' 仓库出入管理查询 ',
-      warehouseInOutAdd: ' 仓库出入管理新增 ',
-      warehouseInOutModify: ' 仓库出入管理修改 ',
-      warehouseInOutDelete: ' 仓库出入管理删除 ',
-      warehouseInOutExport: ' 仓库出入管理导出 '
-    },
-    containerManagement: {
-      addContainer: ' 新增容器 ',
-      editContainer: ' 编辑容器 ',
-      findContainer: ' 查找容器 ',
-      removeContainer: ' 移除容器 '
-    },
-    palletAndMaterialManagement: {
-      queryBoundPalletMaterials: ' 查询绑盘物料 ',
-      bindMaterialButton: ' 绑定物料按钮 ',
-      queryDocumentMaterials: ' 查询单据物料 ',
-      queryEmptyPalletInventory: ' 查询空托盘库存 ',
-      unbindMaterial: ' 解绑物料 ',
-      queryPendingTasks: ' 查询待执行任务 ',
-      inventoryCheckConfirm: ' 盘点确认 ',
-      outboundConfirm: ' 出库确认 ',
-      queryFlatWarehouseInboundOrders: ' 查询平库入库单 ',
-      queryFlatWarehouseOutboundOrders: ' 查询平库出库单 ',
-      qualityInspection: ' 质检 ',
-      queryOutboundConfirmationIntermediateTable: ' 查询出库确认中间表 ',
-      queryShelfDetailTable: ' 查询料架明细表 '
-    },
-    outboundAbnormalityManagement: {
-      outboundAbnormalityQuery: ' 出库异常查询 ',
-      outboundAbnormalityAdd: ' 出库异常新增 ',
-      outboundAbnormalityModify: ' 出库异常修改 ',
-      outboundAbnormalityDelete: ' 出库异常删除 ',
-      outboundAbnormalityExport: ' 出库异常导出 '
-    },
-    interfaceRecordManagement: {
-      interfaceRecordQuery: ' 接口记录查询 ',
-      interfaceRecordAdd: ' 接口记录新增 ',
-      interfaceRecordModify: ' 接口记录修改 ',
-      interfaceRecordDelete: ' 接口记录删除 ',
-      interfaceRecordExport: ' 接口记录导出 '
-    },
-    designatedOutbound: {
-      designatedOutbound: ' 指定出库 '
-    },
-    barcodeGenerationRuleManagement: {
-      barcodeGenerationRuleQuery: ' 条码生成规则查询 ',
-      barcodeGenerationRuleAdd: ' 条码生成规则新增 ',
-      barcodeGenerationRuleModify: ' 条码生成规则修改 ',
-      barcodeGenerationRuleDelete: ' 条码生成规则删除 ',
-      barcodeGenerationRuleExport: ' 条码生成规则导出 ',
-      generatePrintData: ' 生成打印数据 '
-    },
-    barcodeInformationManagement: {
-      barcodeInformationQuery: ' 条码信息查询 ',
-      barcodeInformationAdd: ' 条码信息新增 ',
-      barcodeInformationModify: ' 条码信息修改 ',
-      barcodeInformationDelete: ' 条码信息删除 ',
-      barcodeInformationExport: ' 条码信息导出 ',
-      barcodeInformationPrint: ' 条码信息打印 '
     }
 
   },
@@ -1862,5 +1545,88 @@ export default {
 
     // 设备类型
     unknown: '未知' // 未知
+  },
+  dict:{
+    sys_user_sex:{
+      a1:'男',
+      a2:'女',
+      a3:'未知'
+    },
+    sys_show_hide:{
+      a1:'显示',
+      a2:'隐藏'
+    },
+    sys_normal_disable:{
+      a1:'正常',
+      a2:'停用'
+    },
+    sys_job_status:{
+      a1:"正常",
+      a2:"暂停"
+    },
+    sys_job_group:{
+      a1:'默认',
+      a2:'系统'
+    },
+    sys_yes_no:{
+      a1:'是',
+      a2:'否'
+    },
+    sys_notice_type:{
+      a1:'通知',
+      a2:'公告'
+    },
+    sys_notice_status:{
+      a1:'正常',
+      a2:'关闭'
+    },
+    sys_oper_type:{
+      a1:'新增',
+      a2:'修改',
+      a3:'删除',
+      a4:'授权',
+      a5:'导出',
+      a6:'导入',
+      a7:'强退',
+      a8:'生成代码',
+      a9:'清空数据',
+      a10:'其他'
+    },
+    sys_common_status:{
+      a1:'成功',
+      a2:'失败'
+    },
+    interface_status:{
+      a1:'成功',
+      a2:'失败'
+    },
+    port_type:{
+      a1:'CTU放货点',
+      a2:'高架库放货点',
+      a3:'平库放货点',
+      a4:'集货区放货点'
+    },
+    cache_port_status:{
+      a1:'未发送标签',
+      a2:'已发送标签'
+    },
+    wms_task_type:{
+      a1:'入库CTU任务',
+      a2:'出库CTU任务',
+      a3:'AGV搬运任务'
+    },
+    task_status:{
+      a1:'任务新建',
+      a2:'任务请求',
+      a3:'任务开始',
+      a4:'走出储位',
+      a5:'任务结束'
+    },
+    ssj_type:{
+      a1:'出库输送机',
+      a2:'拣选输送机',
+      a3:'入库输送机',
+      a4:'其它输送机'
+    }
   }
 }

ruoyi-ui/src/views/device/DeviceCar/index.vue

@@ -331,3 +331,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>

ruoyi-ui/src/views/device/ssj/index.vue

@@ -328,3 +328,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>

ruoyi-ui/src/views/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 统计卡片 -->
     <el-row :gutter="20" class="stats-row">
-      <el-col :span="4">
+      <el-col :span="5" >
         <el-card class="stats-card">
           <div class="stats-content">
             <div class="stats-icon agv-icon">
@@ -15,7 +15,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="4">
+      <el-col :span="5">
         <el-card class="stats-card">
           <div class="stats-content">
             <div class="stats-icon ctu-icon">
@@ -54,7 +54,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="4">
         <el-card class="stats-card">
           <div class="stats-content">
             <div class="stats-icon finish-icon">

ruoyi-ui/src/views/system/dict/data.vue

@@ -192,6 +192,7 @@
 <script>
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data"
 import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type"
+import i18n from "@/lang";
 
 export default {
   name: "Data",
@@ -295,6 +296,10 @@ export default {
     getList() {
       this.loading = true
       listData(this.queryParams).then(response => {
+        response.rows = response.rows.map(item => ({
+          ...item,
+          dictLabel: i18n.t(item.dictLabel) || item.dictLabel
+        }))
         this.dataList = response.rows
         this.total = response.total
         this.loading = false
@@ -399,4 +404,4 @@ export default {
     }
   }
 }
-</script>
+</script>

ruoyi-ui/src/views/system/post/index.vue

@@ -146,11 +146,11 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <!-- 岗位名称 -->
         <el-form-item :label="$t('systemManagement_PostManagement.postName')" prop="postName">
-          <el-input v-model="form.postName" :placeholder="$t('systemManagement_PostManagement.placeholderPostName')" />
+          <el-input v-model="form.postName" :placeholder="$t('systemManagement_PostManagement.placeholderpostName')" />
         </el-form-item>
         <!-- 岗位编码 -->
         <el-form-item :label="$t('systemManagement_PostManagement.postCode')" prop="postCode">
-          <el-input v-model="form.postCode" :placeholder="$t('systemManagement_PostManagement.placeholderPostCode')" />
+          <el-input v-model="form.postCode" :placeholder="$t('systemManagement_PostManagement.placeholderpostCode')" />
         </el-form-item>
         <!-- 岗位顺序 -->
         <el-form-item :label="$t('systemManagement_PostManagement.postSort')" prop="postSort">