diff --git a/apps/hand-factory/components/klp-header/klp-header.vue b/apps/hand-factory/components/klp-header/klp-header.vue index f944b8b..8bd4e63 100644 --- a/apps/hand-factory/components/klp-header/klp-header.vue +++ b/apps/hand-factory/components/klp-header/klp-header.vue @@ -38,7 +38,7 @@ export default { lineList: [ { name: "科伦普重工-酸轧机组", key: "acidity" }, // { name: "科伦普重工-彩涂机组", key: "paint" }, - { name: "科伦普重工-镀锌线一组", key: "zinc1" }, + { name: "科伦普重工-镀锌机组", key: "zinc1" }, // { name: "科伦普重工-镀锌线二组", key: "zinc2" }, // { name: "科伦普重工-镀锌线三组", key: "zinc3" }, ], diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index f0dc466..39fd8a4 100644 --- a/apps/hand-factory/config.js +++ b/apps/hand-factory/config.js @@ -9,7 +9,7 @@ module.exports = { // 应用名称 name: "ruoyi-app", // 应用版本 - version: "1.3.24", + version: "1.3.25", // 应用logo logo: "/static/logo.jpg", // 官方网站 diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json index 447fcd7..7bc7581 100644 --- a/apps/hand-factory/manifest.json +++ b/apps/hand-factory/manifest.json @@ -2,7 +2,7 @@ "name" : "科伦普", "appid" : "__UNI__E781B49", "description" : "", - "versionName" : "1.3.24", + "versionName" : "1.3.25", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue index d6ae79d..7892db9 100644 --- a/apps/hand-factory/pages/easycode/easycode.vue +++ b/apps/hand-factory/pages/easycode/easycode.vue @@ -229,7 +229,7 @@ otherTypes() { return this.types.filter(item => { const value = parseInt(item.dictValue); - return value < 100 || value > 199; + return value < 100 || (value > 199 && value < 400); }); } }, diff --git a/apps/hand-factory/pages/easycode/editby.vue b/apps/hand-factory/pages/easycode/editby.vue index c010f0c..ea7fcd6 100644 --- a/apps/hand-factory/pages/easycode/editby.vue +++ b/apps/hand-factory/pages/easycode/editby.vue @@ -1,6 +1,22 @@