修复部分中英文显示问题

src/i18n/lang/en.js

@@ -45,6 +45,7 @@ export default {
     detail:'Detail',
     expandCollapse: 'ExpandCollapse',
     action:'Operation',
+    tip:'Tips'
   },
   login: {
     title: 'System Login',
@@ -116,7 +117,8 @@ export default {
     confirmPasswordRequired: 'Please enter your password again',
     codeRequired: 'Please enter verification code',
     registerSuccess: 'Congratulations! Your account {username} has been registered successfully!',
-    systemTip: 'System Tip'
+    systemTip: 'System Tip',
+
   },
   system: {
     user: {
@@ -207,13 +209,21 @@ export default {
         basicInfo: 'Basic Information',
         roleInfo: 'Role Information',
         authSuccess: 'Authorization successful'
-      }
+      },
+      addUser:'Add User',
+      editUser:'Edit User',
+      import:'import User',
+      resetPwdTitle: 'Please enter the new password for "{userName}"',
+      resetPwdSuccess: 'Edited successfully, the new password is: {newPwd}',
+      resetKeyTitle: 'Please enter the new key password for "{userName}"',
+      resetKeySuccess: 'Edited successfully, the new key password is: {newKey}',
+
     },
     dept: {
-      deptName: 'Dept. Name',
+      deptName: 'DeptName',
       deptNamePlaceholder: 'Please enter department name',
       status: 'Status',
-      deptStatus: 'Dept. Status',
+      deptStatus: 'DeptStatus',
       expandCollapse: 'Expand/Collapse',
       sort: 'Sort',
       createTime: 'Creation Date',
@@ -1490,15 +1500,15 @@ export default {
       deleteSuccess: 'Deleted successfully'
     },
     dict: {
-      dictName: 'Dict. Name',
+      dictName: 'DictName',
       dictNamePlaceholder: 'Please enter dictionary name',
-      dictType: 'Dict. Type',
+      dictType: 'DictType',
       dictTypePlaceholder: 'Please enter dictionary type',
       status: 'Status',
       statusPlaceholder: 'Please select status',
-      dictNo: 'Dict. No.',
+      dictNo: 'DictNo.',
       createTime: 'Creation Date',
-      dictData: 'Dict. Data',
+      dictData: 'DictData',
       dialogTitle: 'Add or Edit Dictionary Type Dialog',
       remarkPlaceholder: 'Please enter remark',
       dictNameRequired: 'Dictionary name cannot be empty',
@@ -1512,33 +1522,33 @@ export default {
       refreshCache: 'Refresh Cache',
       refreshSuccess: 'Refreshed successfully',
       data: {
-        dictLabel: 'Dict. Label',
+        dictLabel: 'DictLabel',
         dictLabelPlaceholder: 'Please enter dictionary label',
         dataStatus: 'Data Status',
-        dictCode: 'Dict. Code',
-        dictKey: 'Dict. Key',
-        dictSort: 'Dict. Sort',
+        dictCode: 'DictCode',
+        dictKey: 'DictKey',
+        dictSort: 'DictSort',
         dialogTitle: 'Add or Edit Parameter Config Dialog',
-        dictType: 'Dict. Type',
-        dataLabel: 'Data Label',
+        dictType: 'DictType',
+        dataLabel: 'DataLabel',
         dataLabelPlaceholder: 'Please enter data label',
-        dataKey: 'Data Key',
+        dataKey: 'DataKey',
         dataKeyPlaceholder: 'Please enter data key',
-        styleAttr: 'Style Attr.',
+        styleAttr: 'StyleAttr.',
         styleAttrPlaceholder: 'Please enter style attribute',
-        displaySort: 'Display Sort',
-        echoStyle: 'Echo Style',
+        displaySort: 'DisplaySort',
+        echoStyle: 'EchoStyle',
         default: 'Default',
         primary: 'Primary',
         success: 'Success',
         info: 'Info',
         warning: 'Warning',
         danger: 'Danger',
-        dataValue: 'Data Value',
+        dataValue: 'DataValue',
         dataValuePlaceholder: 'Please enter data value',
-        cssClass: 'CSS Class',
+        cssClass: 'CSSClass',
         cssClassPlaceholder: 'Please enter CSS class',
-        listClass: 'List Class',
+        listClass: 'ListClass',
         dataLabelRequired: 'Data label cannot be empty',
         dataValueRequired: 'Data value cannot be empty',
         dataKeyRequired: 'Data key cannot be empty',
@@ -1748,15 +1758,11 @@ export default {
       mapWidth: 'Map Width',
       mapHeight: 'Map Height',
       xCoordinate: 'X Coordinate',
-      xCoordinatePlaceholder: 'Please enter X coordinate',
       yCoordinate: 'Y Coordinate',
-      yCoordinatePlaceholder: 'Please enter Y coordinate',
       mapNameRequired: 'Map name cannot be empty',
       mapImageRequired: 'Map image cannot be empty',
       addMap: 'Add Map Data',
       editMap: 'Edit Map Data',
-      editSuccess: 'Updated successfully',
-      addSuccess: 'Added successfully',
       createTime: 'Creation Date',
       detail: 'Detail',
       dialogTitle: 'Add or Edit Parameter Config Dialog',
@@ -1765,8 +1771,6 @@ export default {
       xCoordinatePlaceholder: 'Please enter X coordinate',
       yCoordinatePlaceholder: 'Please enter Y coordinate',
       userNamePlaceholder: 'Please enter userName',
-      fingerprintImport: 'Fingerprint Import',
-      faceImport: 'Face Import',
       fingerprintLogin: 'Fingerprint Login',
       faceLogin: 'Face Login',
       uploadTip: 'Drag file here or click to upload',
@@ -1857,7 +1861,7 @@ export default {
     online: {
       tokenId: 'Token ID',
       loginName: 'Login Name',
-      deptName: 'Dept. Name',
+      deptName: 'DeptName',
       host: 'Host',
       forceLogout: 'Force Logout',
       forceLogoutConfirm: 'Confirm to force logout user "{userName}"?',

src/i18n/lang/zh.js

@@ -44,7 +44,8 @@ export default {
     deleteBatch:'批量删除',
     detail:'详情',
     expandCollapse:'折叠',
-    action:'操作'
+    action:'操作',
+    tip:'提示'
   },
   login: {
     title: '系统登录',
@@ -116,7 +117,7 @@ export default {
     confirmPasswordRequired: '请再次输入您的密码',
     codeRequired: '请输入验证码',
     registerSuccess: '恭喜你，您的账号 {username} 注册成功！',
-    systemTip: '系统提示'
+    systemTip: '系统提示',
   },
   system: {
     user: {
@@ -207,7 +208,16 @@ export default {
         basicInfo: '基本信息',
         roleInfo: '角色信息',
         authSuccess: '授权成功'
-      }
+      },
+      addUser:'新增用户',
+      editUser:'编辑用户',
+      import:'用户导入',
+      // 重置密码相关
+      resetPwdTitle: '请输入"{userName}"的新密码', // 带参数的标题
+      resetPwdSuccess: '编辑成功，新密码是：{newPwd}', // 带参数的成功提示
+      // 重置钥匙密码相关
+      resetKeyTitle: '请输入"{userName}"的新钥匙密码', // 带参数的标题
+      resetKeySuccess: '编辑成功，新钥匙密码是：{newKey}', // 带参数的成功提示
     },
     dept: {
       deptName: '部门名称',
@@ -1762,18 +1772,12 @@ export default {
       dialogTitle: '添加或修改参数配置对话框',
       mapWidthPlaceholder: '请输入图片宽度',
       mapHeightPlaceholder: '请输入图片高度',
-      xCoordinatePlaceholder: '请输入横坐标',
-      yCoordinatePlaceholder: '请输入纵坐标',
       userNamePlaceholder: '请输入userName',
-      fingerprintImport: '指纹导入',
-      faceImport: '人脸导入',
       fingerprintLogin: '指纹登录',
       faceLogin: '人脸登录',
       uploadTip: '将文件拖到此处，或点击上传',
       updateExisting: '是否更新已经存在的设备数据',
       fileFormat: '仅允许导入xls、xlsx格式文件。',
-      editSuccess: '修改成功',
-      addSuccess: '新增成功',
       deleteConfirm: '是否确认删除所选数据项？',
       deleteSuccess: '删除成功'
     },

src/views/mes/dv/lotoStation/index.vue

@@ -102,31 +102,31 @@
         align="center"
         prop="orderNum"
       />
-      <el-table-column 
-        :label="$t('mes.lotoStation.workstation')" 
+      <el-table-column
+        :label="$t('mes.lotoStation.workstation')"
         :width="isEnglish ? '180px' : '120px'"
-        align="center" 
+        align="center"
         prop="workstationName"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.lotoStation.mapName')" 
+      <el-table-column
+        :label="$t('mes.lotoStation.mapName')"
         :width="isEnglish ? '180px' : '140px'"
-        align="center" 
+        align="center"
         prop="mapName"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.lotoStation.motorMapName')" 
+      <el-table-column
+        :label="$t('mes.lotoStation.motorMapName')"
         :width="isEnglish ? '200px' : '160px'"
-        align="center" 
+        align="center"
         prop="motorMapName"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.lotoStation.hardwareSerialNumber')" 
+      <el-table-column
+        :label="$t('mes.lotoStation.hardwareSerialNumber')"
         :width="isEnglish ? '220px' : '180px'"
-        align="center" 
+        align="center"
         prop="lotoSerialNumber"
         show-overflow-tooltip
       ></el-table-column>
@@ -211,7 +211,7 @@
 
     <!-- 添加或修改设备维修单对话框 -->
     <el-dialog :title="title" :visible.sync="open" :width="isEnglish ? '550px' : '450px'" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '160px' : '120px'">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '180px' : '120px'">
         <el-form-item :label="$t('mes.lotoStation.lotoName')" prop="lotoName">
           <el-input v-model="form.lotoName" :placeholder="$t('mes.lotoStation.lotoNamePlaceholder')" />
         </el-form-item>

src/views/mes/dv/segregationpoint/index.vue

@@ -198,9 +198,9 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.segregationPoint.pointName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.segregationPoint.pointName')"
+        align="center"
         prop="pointName"
         :width="isEnglish ? '200px' : '160px'"
         show-overflow-tooltip
@@ -370,12 +370,12 @@
     />
 
     <!-- 添加或修改班组对话框 -->
-    <el-dialog :visible.sync="open" :width="isEnglish ? '1100px' : '960px'" append-to-body>
+    <el-dialog :visible.sync="open" :width="isEnglish ? '1200px' : '960px'" append-to-body>
       <div slot="title" class="dialog-title">
         <i></i>
         <span class="title">{{ title }}</span>
       </div>
-      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '160px' : '110px'">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '210px' : '110px'">
         <el-row>
           <el-col :span="7">
             <el-form-item :label="$t('mes.segregationPoint.pointCode')" prop="pointCode">
@@ -536,13 +536,13 @@
             </el-form-item>
 
             <!--            <el-form-item label="锁具机构类型" prop="locksetTypeId">-->
-            <!--              <treeselect--> 
-            <!--                style="width: 300px"--> 
-            <!--                v-model="form.locksetTypeId"--> 
-            <!--                :options="LockTypeOptions"--> 
-            <!--                :normalizer="normalizerLockset"--> 
-            <!--                placeholder="选择锁具机构类型"--> 
-            <!--              />--> 
+            <!--              <treeselect-->
+            <!--                style="width: 300px"-->
+            <!--                v-model="form.locksetTypeId"-->
+            <!--                :options="LockTypeOptions"-->
+            <!--                :normalizer="normalizerLockset"-->
+            <!--                placeholder="选择锁具机构类型"-->
+            <!--              />-->
             <!--            </el-form-item>-->
           </el-col>
         <el-col :span="11">

src/views/mes/dv/technology/technologyDetail/CraftDetail.vue

@@ -237,8 +237,8 @@
       @pagination="getList"
     />
     <!-- 添加或修改设备列表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="460px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
 <!--        <el-form-item label="所属工艺" prop="parentId">-->
 <!--          <treeselect-->
 <!--            v-model="form.parentId"-->
@@ -319,8 +319,8 @@
       </div>
     </el-dialog>
     <!-- 添加或修改sopLise对话框 -->
-    <el-dialog :title="titlesop" :visible.sync="openSop" width="470px" append-to-body>
-      <el-form ref="sopform" :model="sopform" :rules="rules" label-width="100px">
+    <el-dialog :title="titlesop" :visible.sync="openSop" width="590px" append-to-body>
+      <el-form ref="sopform" :model="sopform" :rules="rules" label-width="190px">
         <el-form-item :label="$t('mes.technology.belongingWorkstation')" prop="workstationId" >
           <treeselect v-model="sopform.workstationId" :options="marsOptions"  :normalizer="Marsnormalizer" :placeholder="$t('mes.technology.selectWorkstation')" disabled/>
         </el-form-item>

src/views/mes/email/emailNotify/index.vue

@@ -134,8 +134,8 @@
       @pagination="getList"
     />
     <!-- 新增或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item :label="$t('mes.emailNotify.reminderItem')" prop="name">
           <el-input v-model="form.name" :placeholder="$t('mes.emailNotify.reminderItemPlaceholder')" />
         </el-form-item>

src/views/mes/email/emailTemplates/index.vue

@@ -144,7 +144,7 @@
     />
     <!-- 新增或修改邮件模板对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item :label="$t('mes.emailTemplates.templateCode')" prop="templateCode">
           <el-input
             :disabled="isEdit"

src/views/mes/hw/Keys/index.vue

@@ -175,7 +175,7 @@
     />
 
     <!-- 添加或修改设备维修单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="490px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('mes.keys.hardwareName')" prop="hardwareId">
           <el-select

src/views/mes/hw/Lock/index.vue

@@ -188,8 +188,8 @@
     />
 
     <!-- 添加或修改设备维修单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '160px' : '120px'">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '170px' : '120px'">
         <el-form-item :label="$t('mes.lock.locksetType')" prop="locksetTypeId">
           <treeselect
             v-model="form.locksetTypeId"

src/views/mes/hw/information/index.vue

@@ -177,25 +177,25 @@
         prop="hardwareTypeName"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.hardwareInfo.specModel')" 
+      <el-table-column
+        :label="$t('mes.hardwareInfo.specModel')"
         :width="isEnglish ? '150px' : '120px'"
-        align="center" 
+        align="center"
         prop="hardwareSpec"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.hardwareInfo.serialNo')" 
+      <el-table-column
+        :label="$t('mes.hardwareInfo.serialNo')"
         :width="isEnglish ? '140px' : '120px'"
-        align="center" 
+        align="center"
         prop="serialNumber"
         show-overflow-tooltip
       />
       <!-- <el-table-column label="所属车间" align="center" prop="workshopName" /> -->
-      <el-table-column 
-        :label="$t('mes.hardwareInfo.hardwareStatus')" 
+      <el-table-column
+        :label="$t('mes.hardwareInfo.hardwareStatus')"
         :width="isEnglish ? '140px' : '120px'"
-        align="center" 
+        align="center"
         prop="status"
       >
         <template slot-scope="scope">
@@ -225,31 +225,31 @@
           <span>{{ scope.row.activationTime }}</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.hardwareInfo.availableCount')" 
+      <el-table-column
+        :label="$t('mes.hardwareInfo.availableCount')"
         :width="isEnglish ? '140px' : '120px'"
-        align="center" 
+        align="center"
         prop="availableTimes"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.hardwareInfo.usedCount')" 
+      <el-table-column
+        :label="$t('mes.hardwareInfo.usedCount')"
         :width="isEnglish ? '130px' : '110px'"
-        align="center" 
+        align="center"
         prop="usedTimes"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.hardwareInfo.availableLifespan')" 
+      <el-table-column
+        :label="$t('mes.hardwareInfo.availableLifespan')"
         :width="isEnglish ? '160px' : '130px'"
-        align="center" 
+        align="center"
         prop="availableLife"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.hardwareInfo.usedLifespan')" 
+      <el-table-column
+        :label="$t('mes.hardwareInfo.usedLifespan')"
         :width="isEnglish ? '150px' : '120px'"
-        align="center" 
+        align="center"
         prop="usedLife"
         show-overflow-tooltip
       />
@@ -300,7 +300,7 @@
     >
       <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '160px' : '120px'">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="7">
             <el-form-item :label="$t('mes.hardwareInfo.hardwareCode')" prop="hardwareCode">
               <el-input
                 v-model="form.hardwareCode"
@@ -309,8 +309,8 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="3">
-            <el-form-item label-width="80">
+          <el-col :span="4">
+            <el-form-item label-width="90">
               <el-switch
                 v-model="autoGenFlag"
                 active-color="#13ce66"

src/views/mes/hw/padLocks/index.vue

@@ -108,31 +108,31 @@
         show-overflow-tooltip
       />
 
-      <el-table-column 
-        :label="$t('mes.padLocks.hardwareName')" 
+      <el-table-column
+        :label="$t('mes.padLocks.hardwareName')"
         :width="isEnglish ? '140px' : '120px'"
-        align="center" 
+        align="center"
         prop="hardwareName"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.padLocks.lockTypeName')" 
+      <el-table-column
+        :label="$t('mes.padLocks.lockTypeName')"
         :width="isEnglish ? '150px' : '120px'"
-        align="center" 
+        align="center"
         prop="lockTypeName"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.padLocks.lockSpec')" 
+      <el-table-column
+        :label="$t('mes.padLocks.lockSpec')"
         :width="isEnglish ? '140px' : '120px'"
-        align="center" 
+        align="center"
         prop="lockSpec"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('common.status')" 
+      <el-table-column
+        :label="$t('common.status')"
         :width="isEnglish ? '100px' : '80px'"
-        align="center" 
+        align="center"
         prop="exStatus"
       >
         <template slot-scope="scope">
@@ -158,10 +158,10 @@
 <!--          <span>{{ scope.row.remark }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column 
-        :label="$t('common.remark')" 
+      <el-table-column
+        :label="$t('common.remark')"
         :width="isEnglish ? '150px' : '120px'"
-        align="center" 
+        align="center"
         prop="exRemark"
         show-overflow-tooltip
       >
@@ -220,7 +220,7 @@
     />
 
     <!-- 添加或修改设备维修单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="490px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '160px' : '120px'">
         <el-form-item :label="$t('mes.padLocks.hardwareName')" prop="hardwareId">
           <el-select

src/views/mes/hw/type/index.vue

@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      :label-width="isEnglish ? '140px' : '100px'"
+      :label-width="isEnglish ? '160px' : '100px'"
     >
       <el-form-item :label="$t('mes.hardwareType.hardwareTypeCode')" prop="hardwareTypeCode">
         <el-input
@@ -155,8 +155,8 @@
     </el-table>
 
     <!-- 添加或修改设备类型对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <el-row>
           <el-col :span="24" v-if="form.parentTypeId !== 0">
             <el-form-item :label="$t('mes.hardwareType.parentType')" prop="parentTypeId">

src/views/mes/hw/workCard/index.vue

@@ -213,7 +213,7 @@
     />
 
     <!-- 添加或修改设备维修单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="490px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '160px' : '120px'">
         <el-form-item :label="$t('mes.workCard.userName')" prop="userId" style="width: 340px">
           <el-select

src/views/mes/material/inspectionplan/index.vue

@@ -317,7 +317,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改班组对话框 -->
-    <el-dialog :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :visible.sync="open" width="560px" append-to-body>
       <div slot="title" class="dialog-title">
         <i></i>
         <span class="title">{{ title }}</span>

src/views/mes/material/instructions/index.vue

@@ -173,13 +173,13 @@
       @pagination="getList"
     />
     <!-- 添加或修改物资对话框 -->
-    <el-dialog :visible.sync="open" width="500px" append-to-body >
+    <el-dialog :visible.sync="open" width="520px" append-to-body >
 
       <div slot="title" class="dialog-title">
         <i></i>
         <span class="title">{{ title }}</span>
       </div>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('mes.instructions.orderNum')" prop="orderNum">
           <el-input-number
             style="width: 350px"

src/views/mes/material/lockers/index.vue

@@ -238,23 +238,23 @@
           @selection-change="handleSelectionChange"
         >
           <!--          <el-table-column type="selection" width="55" align="center"/>-->
-          <el-table-column 
-            :label="$t('mes.lockers.cabinetId')" 
-            align="center" 
+          <el-table-column
+            :label="$t('mes.lockers.cabinetId')"
+            align="center"
             prop="cabinetId"
             :width="isEnglish ? '180px' : '120px'"
             show-overflow-tooltip
           >
           </el-table-column>
-          <el-table-column 
-            :label="$t('mes.lockers.cabinetName')" 
-            prop="cabinetName" 
+          <el-table-column
+            :label="$t('mes.lockers.cabinetName')"
+            prop="cabinetName"
             :width="isEnglish ? '200px' : '150px'"
             show-overflow-tooltip
           />
-          <el-table-column 
-            :label="$t('mes.lockers.cabinetPicture')" 
-            prop="cabinetPicture" 
+          <el-table-column
+            :label="$t('mes.lockers.cabinetPicture')"
+            prop="cabinetPicture"
             width="120"
             align="center"
           >
@@ -277,9 +277,9 @@
               <span v-else>-</span>
             </template>
           </el-table-column>
-          <el-table-column 
-            :label="$t('mes.lockers.cabinetStatus')" 
-            align="center" 
+          <el-table-column
+            :label="$t('mes.lockers.cabinetStatus')"
+            align="center"
             prop="status"
             :width="isEnglish ? '180px' : '120px'"
           >
@@ -290,9 +290,9 @@
               />
             </template>
           </el-table-column>
-          <el-table-column 
-            :label="$t('mes.lockers.exceptionType')" 
-            prop="exReason" 
+          <el-table-column
+            :label="$t('mes.lockers.exceptionType')"
+            prop="exReason"
             :width="isEnglish ? '180px' : '120px'"
             align="center"
           >
@@ -303,8 +303,8 @@
               />
             </template>
           </el-table-column>
-          <el-table-column 
-            :label="$t('mes.lockers.cabinetDetail')" 
+          <el-table-column
+            :label="$t('mes.lockers.cabinetDetail')"
             align="center"
           >
             <template slot-scope="scope">
@@ -321,7 +321,7 @@
             :label="$t('common.operation')"
             align="center"
             class-name="small-padding fixed-width"
-            
+
           >
             <template slot-scope="scope">
               <el-button
@@ -355,12 +355,12 @@
       </div>
     </div>
     <!-- 添加或修改物资柜对话框 -->
-    <el-dialog :visible.sync="open" width="510px" append-to-body>
+    <el-dialog :visible.sync="open" width="600px" append-to-body>
       <div slot="title" class="dialog-title">
         <i></i>
         <span class="title">{{ title }}</span>
       </div>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="170px">
         <el-form-item :label="$t('mes.lockers.cabinetCode')" prop="cabinetCode">
           <el-input
             v-model="form.cabinetCode"

src/views/mes/material/materialinformation/index.vue

@@ -233,17 +233,17 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.materialInfo.materialsId')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.materialInfo.materialsId')"
+        align="center"
         prop="materialsId"
         :width="isEnglish ? '150px' : '130px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.materialInfo.materialsName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.materialInfo.materialsName')"
+        align="center"
         prop="materialsName"
         :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
@@ -262,16 +262,16 @@
         :width="isEnglish ? '150px' : '120px'"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.materialInfo.properties')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.materialInfo.properties')"
+        align="center"
         prop="propertiesValue"
         :width="isEnglish ? '150px' : '120px'"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.materialInfo.materialsPicture')" 
-        prop="materialsTypePicture" 
+      <el-table-column
+        :label="$t('mes.materialInfo.materialsPicture')"
+        prop="materialsTypePicture"
         :width="isEnglish ? '150px' : '120px'"
         align="center"
       >
@@ -294,9 +294,9 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.materialInfo.rfid')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.materialInfo.rfid')"
+        align="center"
         prop="materialsRfid"
         :width="isEnglish ? '150px' : '130px'"
         show-overflow-tooltip
@@ -308,18 +308,18 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.materialInfo.supplier')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.materialInfo.supplier')"
+        align="center"
         prop="supplier"
         :width="isEnglish ? '150px' : '120px'"
         show-overflow-tooltip
       >
       </el-table-column>
       <!--      <el-table-column label="所属柜" align="center" prop="cabinetName" />-->
-      <el-table-column 
-        :label="$t('mes.materialInfo.expirationDate')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.materialInfo.expirationDate')"
+        align="center"
         prop="expirationDate"
         :width="isEnglish ? '180px' : '160px'"
       >
@@ -327,9 +327,9 @@
           {{ scope.row.expirationDate }}
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.materialInfo.inCabinet')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.materialInfo.inCabinet')"
+        align="center"
         prop="loanState"
         :width="isEnglish ? '140px' : '120px'"
       >
@@ -354,9 +354,9 @@
           <span v-if="scope.row.loanState == '1'">√</span> -->
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('common.status')" 
-        align="center" 
+      <el-table-column
+        :label="$t('common.status')"
+        align="center"
         prop="status"
         :width="isEnglish ? '120px' : '100px'"
       >
@@ -403,12 +403,12 @@
       @pagination="getList"
     />
     <!-- 添加或修改物资对话框 -->
-    <el-dialog :visible.sync="open" width="960px" append-to-body>
+    <el-dialog :visible.sync="open" width="1060px" append-to-body>
       <div slot="title" class="dialog-title">
         <i></i>
         <span class="title">{{ title }}</span>
       </div>
-      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '160px' : '110px'">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '180px' : '110px'">
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('mes.materialInfo.bindMaterialsCabinet')" prop="materialsCabinetId">

src/views/mes/material/typeofmaterial/index.vue

@@ -191,8 +191,8 @@
     </el-table>
 
     <!-- 添加或修改设备类型对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :title="title" :visible.sync="open" width="760px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
 <!--        <el-form-item label="父类型" prop="parentId">-->
 <!--          <treeselect-->
 <!--            v-model="form.parentId"-->

src/views/mes/md/locksettype/index.vue

@@ -177,7 +177,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="640px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :label-width="isEnglish ? '200px' : '150px'">
         <el-row>
           <el-col :span="18">

src/views/mes/md/locktype/index.vue

@@ -160,8 +160,8 @@
     </el-table>
 
     <!-- 添加或修改锁具机构类型对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :title="title" :visible.sync="open" width="660px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <el-row>
           <el-col :span="18">
             <el-form-item :label="$t('mes.lockType.parentType')" prop="parentTypeId">

src/views/mes/sop/sopm/index.vue

@@ -166,8 +166,8 @@
       @pagination="getList"
     />
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="470px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-dialog :title="title" :visible.sync="open" width="560px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <!--        <el-form-item label="权重序号" prop="sopIndex">-->
         <!--          <el-input v-model="form.sopIndex" placeholder="请输入权重序号"/>-->
         <!--        </el-form-item>-->

src/views/system/dept/index.vue

@@ -96,8 +96,8 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item :label="$t('system.dept.parentDept')" prop="parentId">

src/views/system/dict/index.vue

@@ -159,7 +159,7 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('systemOther.dict.dictName')" prop="dictName">
           <el-input v-model="form.dictName" :placeholder="$t('systemOther.dict.dictNamePlaceholder')" />
         </el-form-item>
@@ -348,4 +348,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/mapconfig/index.vue

@@ -138,7 +138,7 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item :label="$t('systemOther.mapConfig.mapName')" prop="name">
           <el-input v-model="form.name" :placeholder="$t('systemOther.mapConfig.mapNamePlaceholder')" />
         </el-form-item>
@@ -173,7 +173,7 @@
       </div>
     </el-dialog>
 <!--    车总测试-->
-    <el-dialog  :visible.sync="ImportVisible" width="500px" append-to-body>
+    <el-dialog  :visible.sync="ImportVisible" width="600px" append-to-body>
       <el-form ref="form" :model="ImportForm" :rules="rules" label-width="80px">
         <el-form-item label="userName" prop="userName">
           <el-input v-model="ImportForm.userName" placeholder="请输入userName" />
@@ -200,7 +200,7 @@
           icon="el-icon-user"
           size="mini"
           @click="handleImport('loginFingerprint')"
-        >指纹登录</el-button>
+        >{{ $t('systemOther.mapConfig.fingerprintLogin') }}</el-button>
 
         <el-button
           type="success"
@@ -208,12 +208,12 @@
           icon="el-icon-user-solid"
           size="mini"
           @click="handleImport('loginFace')"
-        >人脸登录</el-button>
+        >{{ $t('systemOther.mapConfig.faceLogin') }}</el-button>
       </el-form>
 
     </el-dialog>
 <!--    车总测试-->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="600px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -408,7 +408,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加地图数据";
+      this.title = this.$t('systemOther.mapConfig.addMap')
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/system/mappoint/index.vue

@@ -115,8 +115,8 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('systemOther.mapPoint.mapName')" prop="mapId">
           <el-select style="width: 280px" v-model="form.mapId" :placeholder="$t('systemOther.mapPoint.mapName')">
             <el-option v-for="item in this.MapOptions" :key="item.id" :label="item.name" :value="item.id">
@@ -400,7 +400,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加地图点位数据'
+      this.title = this.$t('systemOther.mapPoint.addMapPoint')
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/system/mars/index.vue

@@ -172,8 +172,8 @@
     <!--      @pagination="getList"-->
     <!--    />-->
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="480px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('system.post.parentPost')" prop="parentId" v-if="form.parentId !== 0">
           <treeselect
             v-model="form.parentId"

src/views/system/menu/index.vue

@@ -77,7 +77,7 @@
       </el-table-column>
       <el-table-column :label="$t('common.operation')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-no-more-click 
+          <el-button v-no-more-click
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -103,8 +103,8 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('systemOther.menu.parentMenu')">

src/views/system/post/index.vue

@@ -124,8 +124,8 @@
     />
 
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('system.post.postName')" prop="postName">
           <el-input v-model="form.postName" :placeholder="$t('system.post.postNamePlaceholder')" />
         </el-form-item>

src/views/system/role/index.vue

@@ -222,8 +222,8 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-dialog :title="title" :visible.sync="open" width="560px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <el-form-item :label="$t('system.role.roleName')" prop="roleName">
           <el-input v-model="form.roleName" :placeholder="$t('system.role.roleNamePlaceholder')" />
         </el-form-item>
@@ -303,10 +303,10 @@
     <el-dialog
       :title="title"
       :visible.sync="openDataScope"
-      width="500px"
+      width="560px"
       append-to-body
     >
-      <el-form :model="form" label-width="80px">
+      <el-form :model="form" label-width="130px">
         <el-form-item :label="$t('system.role.roleName')">
           <el-input v-model="form.roleName" :disabled="true" />
         </el-form-item>

src/views/system/unit/index.vue

@@ -67,7 +67,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['iscs:unit:add']"
-          >新增
+          >{{ $t('common.add') }}
         </el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
@@ -174,8 +174,8 @@
       @pagination="getList"
     />
     <!-- 添加或修改单位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <!--        <el-form-item label="上级" prop="parentId" v-if="form.parentId !== 0">-->
         <!--          <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级"/>-->
         <!--        </el-form-item>-->

src/views/system/user/AuthRole.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <h4 class="form-header h4">{{ $t('system.user.authRole.basicInfo') }}</h4>
-    <el-form ref="form" :model="form" label-width="80px">
+    <el-form ref="form" :model="form" label-width="120px">
       <el-row>
         <el-col :span="8" :offset="2">
           <el-form-item :label="$t('system.user.nickName')" prop="nickName">
@@ -17,8 +17,8 @@
     </el-form>
 
     <h4 class="form-header h4">{{ $t('system.user.authRole.roleInfo') }}</h4>
-    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
-      <el-table-column :label="$t('common.serialNo')" type="index" align="center">
+    <el-table v-loading="loading"  :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+      <el-table-column :label="$t('common.serialNo')" type="index" align="center" width="90">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
         </template>
@@ -33,7 +33,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
 
     <el-form label-width="100px">
@@ -114,4 +114,4 @@ export default {
     },
   },
 };
-</script>
+</script>

src/views/system/user/index.vue

@@ -405,8 +405,8 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('system.user.name')" prop="nickName">
@@ -1218,7 +1218,8 @@ export default {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.open = true;
-        this.title = "新增用户";
+
+        this.title=this.$t('system.user.addUser')
         this.form.password = this.initPassword;
       });
       this.$nextTick(() => {
@@ -1265,13 +1266,16 @@ export default {
           });
         }
 
-        this.title = "修改用户";
+        this.title=this.$t('system.user.editUser')
         this.form.password = "";
       });
     },
     /** 重置密码按钮操作 */
+    // 重置密码方法
     handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+      // 1. 动态拼接提示标题（基于i18n）
+      const resetPwdTitle = this.$t('system.user.resetPwdTitle', { userName: row.userName });
+      this.$prompt(resetPwdTitle, this.$t('common.tip'), {
         confirmButtonText: this.$t('common.confirm'),
         cancelButtonText: this.$t('common.cancel'),
         closeOnClickModal: false,
@@ -1280,13 +1284,19 @@ export default {
       })
         .then(({ value }) => {
           resetUserPwd(row.userId, value).then((response) => {
-            this.$modal.msgSuccess(this.$t('system.user.editSuccess') + "，新密码是：" + value);
+            // 2. 成功提示文案（参数化拼接）
+            const successMsg = this.$t('system.user.resetPwdSuccess', { newPwd: value });
+            this.$modal.msgSuccess(successMsg);
           });
         })
         .catch(() => {});
     },
+
+// 重置钥匙密码方法
     handleResetKey(row) {
-      this.$prompt('请输入"' + row.userName + '"的新钥匙密码', this.$t('navbar.tip'), {
+      // 1. 动态拼接提示标题（基于i18n）
+      const resetKeyTitle = this.$t('system.user.resetKeyTitle', { userName: row.userName });
+      this.$prompt(resetKeyTitle, this.$t('common.tip'), {
         confirmButtonText: this.$t('common.confirm'),
         cancelButtonText: this.$t('common.cancel'),
         closeOnClickModal: false,
@@ -1295,7 +1305,9 @@ export default {
       })
         .then(({ value }) => {
           resetUserKey(row.userId, value).then((response) => {
-            this.$modal.msgSuccess(this.$t('system.user.editSuccess') + "，新密码是：" + value);
+            // 2. 成功提示文案（参数化拼接）
+            const successMsg = this.$t('system.user.resetKeySuccess', { newKey: value });
+            this.$modal.msgSuccess(successMsg);
           });
         })
         .catch(() => {});
@@ -1400,7 +1412,7 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "用户导入";
+      this.upload.title = this.$t('system.user.import');
       this.upload.open = true;
     },
     /** 下载模板操作 */