diff --git a/.env.development b/.env.development index 488868c..93df8ef 100644 --- a/.env.development +++ b/.env.development @@ -11,6 +11,7 @@ VITE_APP_ROUTER_PREFIX = '/' # 默认上传地址 VITE_APP_UPLOAD_URL = '/Common/UploadFile' - +#设备检查项 +MES_DEVICE_INSPECT ="/device/inspect" #socket API VITE_APP_SOCKET_API = '/msghub' \ No newline at end of file diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index 9d101a0..2126ae1 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -32,16 +32,7 @@ "personalCenter": "Personal", "menuPermi": "Menu permissions", "assignUsers": "Authorized user", - "cacheMonitor": "Cache monitoring", - "dataScreen": "dataScreen", - "emailList": "Mail management", - "emailTemplate": "Email templates", - "emailLog": "Mail records", - "articleCategory": "Article category", - "userOnlineLog": "User online logs", - "dataDiffLog": "Data discrepancy logs", - "smsLog": "SMS logs", - "zujianDemo": "Demo" + "cacheMonitor": "Cache monitoring" }, "tagsView": { "refresh": "refresh", @@ -102,15 +93,12 @@ "workTime": "Today's working times(min)", "onlineClientNum": "Number of online devices", "tagsView": "tabs", - "tagsPersist": "tabs Persist", - "tagsShowIcon": "tabas show icon", - "navMode": "nav mode", - "sideColor": "side color" + "tagsPersist": "tabs Persist" }, "common": { "ok": "Ok", "cancel": "Cancel", - "tips": "Tips", + "tips": "tips", "english": "English", "chinese": "Chinese", "traditionalChinese": "TraditionalChinese", @@ -170,7 +158,9 @@ "view": "To view", "copy": "Copy", "operate": "Operate", - "clean": "Clean" + "clean": "Clean", + "next": "Next", + "back": "Back" }, "language": "Language", "languageKey": "LanguageKey", @@ -190,5 +180,10 @@ "newPwd": "new password", "oldPwd": "Old Password", "nickName": "User's Nickname" + }, + "steps": { + "000": "Basic", + "001": "Complement", + "002": "Other" } } diff --git a/src/i18n/lang/zh-cn.json b/src/i18n/lang/zh-cn.json index 6fad9c4..c7db4d3 100644 --- a/src/i18n/lang/zh-cn.json +++ b/src/i18n/lang/zh-cn.json @@ -1,194 +1,189 @@ { - "menu": { - "home": "首页", - "dashboard": "控制台", - "system": "系统管理", - "monitoring": "系统监控", - "systemTools": "系统工具", - "externalOpen": "外部打开", - "icon": "图标icon", - "systemMenu": "菜单管理", - "systemRole": "角色管理", - "systemUser": "用户管理", - "systemDept": "部门管理", - "systemDic": "字典管理", - "systemPost": "岗位管理", - "systemParam": "参数设置", - "systemLog": "日志管理", - "operLog": "操作日志", - "loginLog": "登录日志", - "systemNotice": "通知公告", - "systemLang": "多语言设置", - "timedTask": "定时任务", - "serviceMonitor": "服务监控", - "codeGeneration": "代码生成", - "systemInterface": "系统接口", - "sendEmail": "发送邮件", - "systemArticle": "文章管理", - "articleList": "文章列表", - "formBuild": "表单构建", - "officialWebsite": "官网地址", - "fileStorage": "文件存儲", - "personalCenter": "个人中心", - "menuPermi": "菜单权限", - "assignUsers": "分配用户", - "cacheMonitor": "缓存监控", - "dataScreen": "数据大屏", - "emailList": "邮件管理", - "emailTemplate": "邮件模板", - "emailLog": "邮件记录", - "articleCategory": "文章目录", - "userOnlineLog": "用户在线日志", - "dataDiffLog": "数据差异日志", - "smsLog": "短信记录", - "zujianDemo": "组件示例" - }, - "tagsView": { - "refresh": "刷新页面", - "close": "关闭当前", - "closeOther": "关闭其它", - "closeLeft": "关闭左侧", - "closeRight": "关闭右侧", - "closeAll": "全部关闭", - "fullscreen": "当前页全屏", - "closeFullscreen": "关闭全屏" - }, - "layout": { - "tip1": "如果觉得不错欢迎给个⭐Star⭐收藏一下，这样作者才有继续免费下去的动力，谢谢！", - "rewardUser": "打赏作者喝杯咖啡表示鼓励", - "contactUs": "联系信息", - "donationSupport": "捐贈支持", - "officialWebsite": "官网", - "qqGroup": "QQ群", - "changeLog": "更新日志", - "currentVersion": "当前版本", - "codeSourceAddress": "源码地址", - "fullscreen": "全屏", - "sizeSelect": "大小设置", - "personalCenter": "个人中心", - "layoutSetting": "布局设置", - "logOut": "退出登录", - "themeStyleSet": "主题风格设置", - "themeColor": "主题颜色", - "sysLayoutSet": "系统风格设置", - "open": "开启", - "fixed": "固定", - "show": "显示", - "dynamicTitle": "动态标题", - "darkMode": "深色", - "lightMode": "明亮", - "saveConfig": "保存配置", - "resetConfig": "重置配置", - "logOutConfirm": "你確定要退出当前登录吗？", - "large": "较大", - "default": "默认", - "small": "较小", - "myWorkbench": "我的工作台", - "onlineUsers": "在线用户", - "message": "消息", - "amount": "金额", - "order": "订单", - "modifyInformation": "修改信息", - "technicalSelection": "技术选型", - "frontendTechnology": "前端技术", - "backendTechnology": "后端技术", - "backstageManagement": "后台管理", - "bottomBar": "底部栏", - "identity": "身份", - "content1": "代码完全免费开源，易读易懂、界面简洁美观，给你的项目多一种选择与参考。", - "topNav": "顶部导航", - "commonFuncs": "常用功能", - "openWatermark": "开启水印", - "workTime": "今日工作时长", - "onlineClientNum": "在线设备数", - "tagsView": "标签页", - "tagsPersist": "标签持久化", - "tagsShowIcon": "标签显示icon", - "navMode": "导航模式", - "sideColor": "侧边栏颜色" - }, - "common": { - "ok": "确定", - "cancel": "取消", - "tips": "提示", - "english": "英文", - "chinese": "中文", - "traditionalChinese": "繁体", - "name": "名称", - "content": "内容", - "addTime": "添加时间", - "nickName": "昵称", - "time": "时间", - "yes": "是", - "no": "否", - "yesterday": "昨天", - "today": "今天", - "thisWeek": "本周", - "lastWeek": "上周", - "thisMonth": "本月", - "lastMonth": "上月", - "sex": "性别", - "male": "男", - "female": "女", - "unknow": "未知", - "systemTips": "系统提示", - "show": "显示", - "hidden": "隐藏", - "default": "默认", - "system": "系统", - "abnormal": "异常", - "normal": "正常", - "disable": "停用" - }, - "btn": { - "add": "新增", - "delete": "删除", - "edit": "编辑", - "search": "搜索", - "reset": "重置", - "preview": "预览", - "import": "导入", - "export": "导出", - "synchronize": "同步", - "generateCode": "生成代码", - "start": "启动", - "stop": "停止", - "run": "运行", - "runOnce": "运行一次", - "log": "日志", - "expand": "展开", - "collapse": "折叠", - "details": "详细", - "submit": "确定", - "cancel": "取消", - "more": "更多", - "save": "保存", - "close": "关闭", - "authorize": "授权", - "multi": "批量", - "upload": "上传", - "view": "查看", - "copy": "复制", - "operate": "操作", - "clean": "清空" - }, - "user": { - "personalInfo": "个人信息", - "userName": "用户名称", - "phoneNumber": "手机号码", - "userEmail": "用户邮箱", - "department": "所属部门", - "role": "所属角色", - "registerTime": "创建日期", - "basicInfo": "基本资料", - "changePwd": "修改密码", - "oldPwd": "旧密码", - "newPwd": "新密码", - "confirmPwd": "确认密码", - "nickName": "用户昵称" - }, - "language": "语言", - "languageKey": "语言key", - "showWay": "显示方式", - "table": "表格" -} + "menu": { + "home": "首页", + "dashboard": "控制台", + "system": "系统管理", + "monitoring": "系统监控", + "systemTools": "系统工具", + "externalOpen": "外部打开", + "icon": "图标icon", + "systemMenu": "菜单管理", + "systemRole": "角色管理", + "systemUser": "用户管理", + "systemDept": "部门管理", + "systemDic": "字典管理", + "systemPost": "岗位管理", + "systemParam": "参数设置", + "systemLog": "日志管理", + "operLog": "操作日志", + "loginLog": "登录日志", + "systemNotice": "通知公告", + "systemLang": "多语言设置", + "timedTask": "定时任务", + "serviceMonitor": "服务监控", + "codeGeneration": "代码生成", + "systemInterface": "系统接口", + "sendEmail": "发送邮件", + "systemArticle": "文章管理", + "articleList": "文章列表", + "formBuild": "表单构建", + "officialWebsite": "官网地址", + "fileStorage": "文件存儲", + "personalCenter": "个人中心", + "menuPermi": "菜单权限", + "assignUsers": "分配用户", + "cacheMonitor": "缓存监控" + }, + "tagsView": { + "refresh": "刷新页面", + "close": "关闭当前", + "closeOther": "关闭其它", + "closeLeft": "关闭左侧", + "closeRight": "关闭右侧", + "closeAll": "全部关闭", + "fullscreen": "当前页全屏", + "closeFullscreen": "关闭全屏" + }, + "layout": { + "tip1": "如果觉得不错欢迎给个⭐Star⭐收藏一下，这样作者才有继续免费下去的动力，谢谢！", + "rewardUser": "打赏作者喝杯咖啡表示鼓励", + "contactUs": "联系信息", + "donationSupport": "捐贈支持", + "officialWebsite": "官网", + "qqGroup": "QQ群", + "changeLog": "更新日志", + "currentVersion": "当前版本", + "codeSourceAddress": "源码地址", + "fullscreen": "全屏", + "sizeSelect": "大小设置", + "personalCenter": "个人中心", + "layoutSetting": "布局设置", + "logOut": "退出登录", + "themeStyleSet": "主题风格设置", + "themeColor": "主题颜色", + "sysLayoutSet": "系统风格设置", + "open": "开启", + "fixed": "固定", + "show": "显示", + "dynamicTitle": "动态标题", + "darkMode": "深色", + "lightMode": "明亮", + "saveConfig": "保存配置", + "resetConfig": "重置配置", + "logOutConfirm": "你確定要退出当前登录吗？", + "large": "较大", + "default": "默认", + "small": "较小", + "myWorkbench": "我的工作台", + "onlineUsers": "在线用户", + "message": "消息", + "amount": "金额", + "order": "订单", + "modifyInformation": "修改信息", + "technicalSelection": "技术选型", + "frontendTechnology": "前端技术", + "backendTechnology": "后端技术", + "backstageManagement": "后台管理", + "bottomBar": "底部栏", + "identity": "身份", + "content1": "代码完全免费开源，易读易懂、界面简洁美观，给你的项目多一种选择与参考。", + "topNav": "顶部导航", + "commonFuncs": "常用功能", + "openWatermark": "开启水印", + "workTime": "今日工作时长", + "onlineClientNum": "在线设备数", + "tagsView": "标签页", + "tagsPersist": "标签持久化" + }, + "common": { + "ok": "确定", + "cancel": "取消", + "tips": "提示", + "english": "英文", + "chinese": "中文", + "traditionalChinese": "繁体", + "name": "名称", + "content": "内容", + "addTime": "添加时间", + "nickName": "昵称", + "time": "时间", + "yes": "是", + "no": "否", + "yesterday": "昨天", + "today": "今天", + "thisWeek": "本周", + "lastWeek": "上周", + "thisMonth": "本月", + "lastMonth": "上月", + "sex": "性别", + "male": "男", + "female": "女", + "unknow": "未知", + "systemTips": "系统提示", + "show": "显示", + "hidden": "隐藏", + "default": "默认", + "system": "系统", + "abnormal": "异常", + "normal": "正常", + "disable": "停用" + }, + "btn": { + "add": "新增", + "delete": "删除", + "edit": "编辑", + "search": "搜索", + "reset": "重置", + "preview": "预览", + "import": "导入", + "export": "导出", + "synchronize": "同步", + "generateCode": "生成代码", + "start": "启动", + "stop": "停止", + "run": "运行", + "runOnce": "运行一次", + "log": "日志", + "expand": "展开", + "collapse": "折叠", + "details": "详细", + "submit": "确定", + "cancel": "取消", + "more": "更多", + "save": "保存", + "close": "关闭", + "authorize": "授权", + "multi": "批量", + "upload": "上传", + "view": "查看", + "copy": "复制", + "operate": "操作", + "clean": "清空", + "next": "下一步", + "back": "返回" + }, + "user": { + "personalInfo": "个人信息", + "userName": "用户名称", + "phoneNumber": "手机号码", + "userEmail": "用户邮箱", + "department": "所属部门", + "role": "所属角色", + "registerTime": "创建日期", + "basicInfo": "基本资料", + "changePwd": "修改密码", + "oldPwd": "旧密码", + "newPwd": "新密码", + "confirmPwd": "确认密码", + "nickName": "用户昵称" + }, + "steps": { + "000": "基本信息", + "001": "补充信息", + "002": "其他信息" + }, + "language": "语言", + "languageKey": "语言key", + "showWay": "显示方式", + "table": "表格" +} \ No newline at end of file diff --git a/src/i18n/lang/zh-tw.json b/src/i18n/lang/zh-tw.json index 91ec5f1..5b13766 100644 --- a/src/i18n/lang/zh-tw.json +++ b/src/i18n/lang/zh-tw.json @@ -1,194 +1,189 @@ { - "menu": { - "home": "首頁", - "dashboard": "控制臺", - "system": "系統管理", - "monitoring": "系統監控", - "systemTools": "系統工具", - "externalOpen": "外部打開", - "icon": "圖標icon", - "systemMenu": "菜單管理", - "systemRole": "角色管理", - "systemUser": "用戶管理", - "systemDept": "部門管理", - "systemDic": "字典管理", - "systemPost": "崗位管理", - "systemParam": "參數设置", - "systemLog": "日誌管理", - "operLog": "操作日誌", - "loginLog": "登錄日誌", - "systemNotice": "系統公告", - "systemLang": "多語言设置", - "timedTask": "定时任務", - "serviceMonitor": "服務監控", - "codeGeneration": "代碼生成", - "systemInterface": "系統接口", - "sendEmail": "發送郵件", - "systemArticle": "文章管理", - "articleList": "文章列表", - "formBuild": "表單構建", - "officialWebsite": "官網地址", - "fileStorage": "文件存儲", - "personalCenter": "個人中心", - "menuPermi": "菜單權限", - "assignUsers": "分配用戶", - "cacheMonitor": "緩存監控", - "dataScreen": "數據大屏", - "emailList": "郵件管理", - "emailTemplate": "郵件模板", - "emailLog": "郵件記錄", - "articleCategory": "文章目錄", - "userOnlineLog": "用戶在線日誌", - "dataDiffLog": "數據差異日誌", - "smsLog": "短信記錄", - "zujianDemo": "組件示例" - }, - "tagsView": { - "refresh": "重繪", - "close": "關閉", - "closeOther": "關閉其它", - "closeLeft": "關閉左侧", - "closeRight": "關閉右侧", - "closeAll": "全部關閉", - "fullscreen": "當前頁全屏", - "closeFullscreen": "關閉全屏" - }, - "layout": { - "tip1": "如果覺得不錯歡迎給個⭐Star⭐收藏壹下，這樣作者才有繼續免費下去的動力，謝謝！", - "contactUs": "聯繫信息", - "donationSupport": "捐贈支持", - "officialWebsite": "官網", - "qqGroup": "QQ群", - "changeLog": "更新日誌", - "currentVersion": "當前版本", - "codeSourceAddress": "源碼地址", - "fullscreen": "全屏", - "sizeSelect": "大小設置", - "personalCenter": "個人中心", - "layoutSetting": "佈局設置", - "logOut": "退出登錄", - "themeStyleSet": "主題風格設置", - "themeColor": "主題顏色", - "sysLayoutSet": "系統風格設置", - "open": "開啟", - "fixed": "固定", - "show": "顯示", - "dynamicTitle": "動態標題", - "darkMode": "深色", - "lightMode": "明亮", - "saveConfig": "保存配置", - "resetConfig": "重置配置", - "logOutConfirm": "你確定要退出当前登录吗？", - "large": "較大", - "default": "默認", - "small": "較小", - "myWorkbench": "我的工作台", - "onlineUsers": "在線用戶", - "message": "消息", - "amount": "金額", - "order": "訂單", - "modifyInformation": "修改信息", - "technicalSelection": "技術選型", - "frontendTechnology": "前端技術", - "backendTechnology": "後端技術", - "backstageManagement": "後台管理", - "bottomBar": "底部欄", - "identity": "身份", - "rewardUser": "打賞作者喝杯咖啡表示鼓勵", - "content1": "代碼完全免費開源，易讀易懂、界面簡潔美觀，給你的項目多一種選擇與參考。", - "topNav": "頂部導航", - "commonFuncs": "常用功能", - "openWatermark": "開啟水印", - "workTime": "今日工作時長(分)", - "onlineClientNum": "在線設備數", - "tagsView": "標簽頁", - "tagsPersist": "標簽持久化", - "tagsShowIcon": "標簽顯示icon", - "navMode": "導航模式", - "sideColor": "側邊欄顏色" - }, - "common": { - "ok": "確定", - "cancel": "取消", - "tips": "提示", - "english": "英文", - "chinese": "中文簡體", - "traditionalChinese": "繁體", - "name": "名稱", - "content": "內容", - "addTime": "添加時間", - "nickName": "暱稱", - "time": "時間", - "yes": "是", - "no": "否", - "yesterday": "昨天", - "thisWeek": "本週", - "lastWeek": "上週", - "thisMonth": "本月", - "lastMonth": "上月", - "today": "今天", - "female": "女", - "male": "男", - "sex": "性別", - "systemTips": "系統提示", - "abnormal": "異常", - "normal": "正常", - "disable": "停用", - "hidden": "隱藏", - "show": "顯示", - "system": "系統", - "default": "默認", - "unknow": "未知" - }, - "btn": { - "add": "新增", - "delete": "刪除", - "edit": "編輯", - "search": "搜索", - "reset": "重置", - "preview": "預覽", - "import": "導入", - "export": "導出", - "synchronize": "同步", - "generateCode": "生成代碼", - "start": "啟動", - "stop": "停止", - "run": "運行", - "runOnce": "運行一次", - "log": "日誌", - "expand": "展開", - "collapse": "折疊", - "details": "詳細", - "submit": "確定", - "cancel": "取消", - "more": "更多", - "save": "保存", - "upload": "上傳", - "view": "查看", - "copy": "複製", - "operate": "操作", - "authorize": "授權", - "close": "關閉", - "multi": "批量", - "clean": "清空" - }, - "language": "語言", - "languageKey": "語言key", - "showWay": "顯示方式", - "table": "表格", - "user": { - "phoneNumber": "手機號碼", - "registerTime": "創建日期", - "department": "所屬部門", - "personalInfo": "個人信息", - "role": "所屬角色", - "userEmail": "用戶郵箱", - "basicInfo": "基本資料", - "userName": "用戶名稱", - "changePwd": "修改密碼", - "confirmPwd": "確認密碼", - "newPwd": "新密碼", - "oldPwd": "舊密碼", - "nickName": "用戶暱稱" - } -} + "menu": { + "home": "首頁", + "dashboard": "控制臺", + "system": "系統管理", + "monitoring": "系統監控", + "systemTools": "系統工具", + "externalOpen": "外部打開", + "icon": "圖標icon", + "systemMenu": "菜單管理", + "systemRole": "角色管理", + "systemUser": "用戶管理", + "systemDept": "部門管理", + "systemDic": "字典管理", + "systemPost": "崗位管理", + "systemParam": "參數设置", + "systemLog": "日誌管理", + "operLog": "操作日誌", + "loginLog": "登錄日誌", + "systemNotice": "系統公告", + "systemLang": "多語言设置", + "timedTask": "定时任務", + "serviceMonitor": "服務監控", + "codeGeneration": "代碼生成", + "systemInterface": "系統接口", + "sendEmail": "發送郵件", + "systemArticle": "文章管理", + "articleList": "文章列表", + "formBuild": "表單構建", + "officialWebsite": "官網地址", + "fileStorage": "文件存儲", + "personalCenter": "個人中心", + "menuPermi": "菜單權限", + "assignUsers": "分配用戶", + "cacheMonitor": "緩存監控" + }, + "tagsView": { + "refresh": "重繪", + "close": "關閉", + "closeOther": "關閉其它", + "closeLeft": "關閉左侧", + "closeRight": "關閉右侧", + "closeAll": "全部關閉", + "fullscreen": "當前頁全屏", + "closeFullscreen": "關閉全屏" + }, + "layout": { + "tip1": "如果覺得不錯歡迎給個⭐Star⭐收藏壹下，這樣作者才有繼續免費下去的動力，謝謝！", + "contactUs": "聯繫信息", + "donationSupport": "捐贈支持", + "officialWebsite": "官網", + "qqGroup": "QQ群", + "changeLog": "更新日誌", + "currentVersion": "當前版本", + "codeSourceAddress": "源碼地址", + "fullscreen": "全屏", + "sizeSelect": "大小設置", + "personalCenter": "個人中心", + "layoutSetting": "佈局設置", + "logOut": "退出登錄", + "themeStyleSet": "主題風格設置", + "themeColor": "主題顏色", + "sysLayoutSet": "系統風格設置", + "open": "開啟", + "fixed": "固定", + "show": "顯示", + "dynamicTitle": "動態標題", + "darkMode": "深色", + "lightMode": "明亮", + "saveConfig": "保存配置", + "resetConfig": "重置配置", + "logOutConfirm": "你確定要退出当前登录吗？", + "large": "較大", + "default": "默認", + "small": "較小", + "myWorkbench": "我的工作台", + "onlineUsers": "在線用戶", + "message": "消息", + "amount": "金額", + "order": "訂單", + "modifyInformation": "修改信息", + "technicalSelection": "技術選型", + "frontendTechnology": "前端技術", + "backendTechnology": "後端技術", + "backstageManagement": "後台管理", + "bottomBar": "底部欄", + "identity": "身份", + "rewardUser": "打賞作者喝杯咖啡表示鼓勵", + "content1": "代碼完全免費開源，易讀易懂、界面簡潔美觀，給你的項目多一種選擇與參考。", + "topNav": "頂部導航", + "commonFuncs": "常用功能", + "openWatermark": "開啟水印", + "workTime": "今日工作時長(分)", + "onlineClientNum": "在線設備數", + "tagsView": "標簽頁", + "tagsPersist": "標簽持久化" + }, + "common": { + "ok": "確定", + "cancel": "取消", + "tips": "提示", + "english": "英文", + "chinese": "中文簡體", + "traditionalChinese": "繁體", + "name": "名稱", + "content": "內容", + "addTime": "添加時間", + "nickName": "暱稱", + "time": "時間", + "yes": "是", + "no": "否", + "yesterday": "昨天", + "thisWeek": "本週", + "lastWeek": "上週", + "thisMonth": "本月", + "lastMonth": "上月", + "today": "今天", + "female": "女", + "male": "男", + "sex": "性別", + "systemTips": "系統提示", + "abnormal": "異常", + "normal": "正常", + "disable": "停用", + "hidden": "隱藏", + "show": "顯示", + "system": "系統", + "default": "默認", + "unknow": "未知" + }, + "btn": { + "add": "新增", + "delete": "刪除", + "edit": "編輯", + "search": "搜索", + "reset": "重置", + "preview": "預覽", + "import": "導入", + "export": "導出", + "synchronize": "同步", + "generateCode": "生成代碼", + "start": "啟動", + "stop": "停止", + "run": "運行", + "runOnce": "運行一次", + "log": "日誌", + "expand": "展開", + "collapse": "折疊", + "details": "詳細", + "submit": "確定", + "cancel": "取消", + "more": "更多", + "save": "保存", + "upload": "上傳", + "view": "查看", + "copy": "複製", + "operate": "操作", + "authorize": "授權", + "close": "關閉", + "multi": "批量", + "clean": "清空", + "next": "下一步", + "back": "返回" + }, + "language": "語言", + "languageKey": "語言key", + "showWay": "顯示方式", + "table": "表格", + "user": { + "phoneNumber": "手機號碼", + "registerTime": "創建日期", + "department": "所屬部門", + "personalInfo": "個人信息", + "role": "所屬角色", + "userEmail": "用戶郵箱", + "basicInfo": "基本資料", + "userName": "用戶名稱", + "changePwd": "修改密碼", + "confirmPwd": "確認密碼", + "newPwd": "新密碼", + "oldPwd": "舊密碼", + "nickName": "用戶暱稱" + }, + "steps": { + "000": "基本信息", + "001": "补充信息", + "002": "其他信息" + } +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 1215aed..9fed210 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,4 +1,4 @@ -import { createWebHistory, createRouter } from 'vue-router' +import { createWebHistory, createRouter, createWebHashHistory } from 'vue-router' import Layout from '@/layout' /** @@ -23,6 +23,67 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [ + { + name: 'Fullscreen', + path: '/fullscreen', + component: () => import('@/views/deviceManagement/datascreen/index.vue'), + hidden: true + }, + // { + // name: 'Fullscreen2', + // path: '/fullscreen2', + // component: () => import('@/views/andonManagement/analysis/fullscreen/index.vue'), + // hidden: true + // }, + { + name: 'TheTaskExecuteView', + path: '/TheTaskExecuteView', + component: () => import('@/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue'), + hidden: true + }, + { + name: 'SmartScreen', + path: '/SmartScreen', + component: () => import('@/views/SmartScreen/index.vue'), + hidden: true + }, + { + name: 'ProdScreen', + path: '/SmartScreen/ProdScreen', + component: () => import('@/views/SmartScreen/ProdScreen/index.vue'), + hidden: true + }, + { + name: 'QualityScreen', + path: '/SmartScreen/QualityScreen', + component: () => import('@/views/SmartScreen/QualityScreen/index.vue'), + hidden: true + }, + { + name: 'DeviceScreen', + path: '/SmartScreen/DeviceScreen', + component: () => import('@/views/SmartScreen/DeviceScreen/index.vue'), + hidden: true + }, + { + name: 'touchScreen', + path: '/productManagement/touchScreen', + component: () => import('@/views/touchScreen/main/index.vue'), + hidden: true + }, + // { + // name: 'KANBAN', + // path: '/KANBAN', + // component: () => import('@/views/largeScreen/KANBAN/index.vue'), + // hidden: true + // }, + // 物料备料大屏 + // { + // name: 'materialKANBAN', + // path: '/materialManagement/materialKANBAN', + // component: () => import('@/views/materialMangement/materialKANBAN/KANBAN/index.vue'), + // hidden: true + // }, { path: '/redirect', component: Layout, @@ -64,13 +125,7 @@ export const constantRoutes = [ component: () => import('@/views/error/Error'), hidden: true }, - // 触摸屏 - { - path: '/productManagement/touchScreen', - component: () => import('@/views/touchScreen/main/index'), - hidden: true - }, - + //todo app.vue 里路由跳转 { path: '', component: Layout, @@ -101,7 +156,8 @@ export const constantRoutes = [ ] const router = createRouter({ - history: createWebHistory(import.meta.env.VITE_APP_ROUTER_PREFIX), + //history: createWebHistory(import.meta.env.VITE_APP_ROUTER_PREFIX), + history: createWebHashHistory(), routes: constantRoutes, scrollBehavior(to, from, savedPosition) { if (savedPosition) { diff --git a/src/views/touchScreen/main/index.vue b/src/views/touchScreen/main/index.vue index f1cf535..dd837f4 100644 --- a/src/views/touchScreen/main/index.vue +++ b/src/views/touchScreen/main/index.vue @@ -10,7 +10,7 @@ @@ -50,6 +50,60 @@ const { proxy } = getCurrentInstance() const goBack = () => { proxy.$router.push({ path: '/' }) } +/// =========================== 全屏监听 ========================== +// 定义全屏状态 +const isFullScreen = ref(false); +function doScreen() { + if (isFullScreen.value) { + exitFullScreen() + } else { + goFullScreen() + } +} + + +// 检查当前是否为全屏模式 +const checkIsFullScreen = () => { + isFullScreen.value = document.fullscreenElement !== null; +}; + +// 进入全屏 +const goFullScreen = () => { + const appEl = document.getElementById('app'); + if (appEl) { + appEl.requestFullscreen(); + checkIsFullScreen(); // 更新状态 + } +}; + +// 退出全屏 +const exitFullScreen = () => { + document.exitFullscreen() + .catch(() => { + console.error('退出全屏失败'); + }); + checkIsFullScreen(); // 更新状态 +}; + +// 监听全屏状态变化 +const fullScreenChangeHandler = () => { + checkIsFullScreen(); +}; + +// 在组件挂载时设置事件监听 +onMounted(() => { + document.addEventListener('fullscreenchange', fullScreenChangeHandler); +}); + +// 在组件卸载时移除事件监听 +onUnmounted(() => { + document.removeEventListener('fullscreenchange', fullScreenChangeHandler); +}); +/// ================================================================================== + + + + // 右侧菜单 const listItems = ref([ { title: '报工', value: '报工', icon: 'mdi-clipboard-file-outline' }, diff --git a/src/views/touchScreen/report/index.vue b/src/views/touchScreen/report/index.vue index 5138d61..93c53a9 100644 --- a/src/views/touchScreen/report/index.vue +++ b/src/views/touchScreen/report/index.vue @@ -22,6 +22,7 @@ v-model="formData.feedOrder"> +
{{ getButtonName() }} @@ -36,7 +37,7 @@ {{ - `完成数:${item.finishNum} 不良数:${item.badNum}` + `完成数:${item.finishNum ?? 0} 不良数:${item.badNum ?? 0}` }} {{ `作业员:${item.worker} 提交时间:${item.jobDate}` }} @@ -209,18 +210,39 @@ function handleScanInput(val) { } function getFormData(workorder) { - ReportApi.GetWorkOrderDetail({ workorder }).then(res => { + const params = { workorder, processId: processId.value } + ReportApi.GetWorkOrderDetail(params).then(res => { if (res.code == 200) { if (res.data) { formData.value = res.data - ReportApi.GetWorkOrderReportWorkList({ workorder, processId: processId.value }).then(res => { + ReportApi.GetProcessReportWorkDetail(params).then(res2 => { + if (!res2.data) { + formData.value.finishNum = 0; + formData.value.badNum = 0; + formData.value.worker = ''; + } + else { + formData.value.finishNum = res2.data.finishNum ?? 0; + formData.value.badNum = res2.data.badNum ?? 0; + formData.value.worker = res2.data.worker; + if (formData.value.finishNum > 0) { + dialog.show = true + dialog.class = 'bg-yellow' + dialog.title = '提示' + dialog.text = '工单此工序已报工过' + } + } + }) + ReportApi.GetWorkOrderReportWorkList(params).then(res => { if (res.code == 200) { reportWorkerOrderList.value = res.data } }) } else { dialog.show = true - dialog.text = '没有找到该工单' + dialog.class = 'bg-amber' + dialog.title = '工单提示' + dialog.text = '工单号不正确,没有找到该工单' } } }) @@ -237,7 +259,7 @@ function submit() { feed_order: formData.value.feedOrder, stove_code: formData.value.stoveCode, customer_order: formData.value.customerOrder, - // worker: formData.value.worker + process_operator: formData.value.worker }; // 领料 if (processId.value === 10) { @@ -245,6 +267,7 @@ function submit() { if (res.code == 200) { dialog.show = true dialog.class = 'bg-green' + dialog.title = '成功提示' dialog.text = '领料成功' } }) @@ -255,6 +278,7 @@ function submit() { if (res.code == 200) { dialog.show = true dialog.class = 'bg-green' + dialog.title = '成功提示' dialog.text = '出货成功' } } @@ -266,6 +290,7 @@ function submit() { if (res.code == 200) { dialog.show = true dialog.class = 'bg-green' + dialog.title = '成功提示' dialog.text = '报工成功' } }