From 29e4bb2432d129605d373630e42b271fadaadaa1 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 15 Aug 2024 13:28:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=B7=A5=E6=AE=B5=E5=AF=B9=E5=BA=94=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B7=A5=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 72 +++++++++++++++++--- src/views/wpm_gx/baipaopian.vue | 62 +++++++++++++++++ src/views/wpm_gx/chengpinpao.vue | 62 +++++++++++++++++ src/views/wpm_gx/handover.vue | 2 +- src/views/wpm_gx/inm.vue | 2 +- src/views/wpm_gx/jianbo.vue | 2 +- src/views/wpm_gx/jianbob.vue | 62 +++++++++++++++++ src/views/wpm_gx/mlogs.vue | 2 +- src/views/wpm_gx/{mopao.vue => pingmo.vue} | 2 +- src/views/wpm_gx/saobian.vue | 2 +- src/views/wpm_gx/saobianb.vue | 62 +++++++++++++++++ src/views/wpm_gx/{shaojie.vue => tuihuo.vue} | 2 +- src/views/wpm_gx/yicipao.vue | 62 +++++++++++++++++ 13 files changed, 378 insertions(+), 18 deletions(-) create mode 100644 src/views/wpm_gx/baipaopian.vue create mode 100644 src/views/wpm_gx/chengpinpao.vue create mode 100644 src/views/wpm_gx/jianbob.vue rename src/views/wpm_gx/{mopao.vue => pingmo.vue} (98%) create mode 100644 src/views/wpm_gx/saobianb.vue rename src/views/wpm_gx/{shaojie.vue => tuihuo.vue} (98%) create mode 100644 src/views/wpm_gx/yicipao.vue diff --git a/src/config/route.js b/src/config/route.js index 64f7347a..5c1489eb 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1401,11 +1401,21 @@ const routes = [ }, component: "wpm_gx/qiepian", }, + { + name: "baipaopian", + path: "/wpm_gx/baipaopian", + meta: { + title: "白片抛", + // icon: "el-icon-files", + perms: ["wpm_bpp"], + }, + component: "wpm_gx/baipaopian", + }, { name: "saobian", path: "/wpm_gx/saobian", meta: { - title: "扫边", + title: "扫边A", // icon: "el-icon-cellphone", perms: ["wpm_sb"], }, @@ -1422,25 +1432,45 @@ const routes = [ component: "wpm_gx/heihua", }, { - name: "shaojie", - path: "/wpm_gx/shaojie", + name: "tuihuo", + path: "/wpm_gx/tuihuo", meta: { - title: "烧结", + title: "退火", // icon: "el-icon-cellphone", perms: ["wpm_sj"], }, - component: "wpm_gx/shaojie", + component: "wpm_gx/tuihuo", }, { name: "jianbo", path: "/wpm_gx/jianbo", meta: { - title: "减薄", + title: "减薄A", // icon: "el-icon-cellphone", perms: ["wpm_jb"], }, component: "wpm_gx/jianbo", }, + { + name: "jianbob", + path: "/wpm_gx/jianbob", + meta: { + title: "减薄B", + // icon: "el-icon-cellphone", + perms: ["wpm_jbb"], + }, + component: "wpm_gx/jianbob", + }, + { + name: "pingmo", + path: "/wpm_gx/pingmo", + meta: { + title: "平磨", + // icon: "el-icon-cellphone", + perms: ["wpm_mp"], + }, + component: "wpm_gx/pingmo", + }, { name: "jingdiao", path: "/wpm_gx/jingdiao", @@ -1452,14 +1482,34 @@ const routes = [ component: "wpm_gx/jingdiao", }, { - name: "mopao", - path: "/wpm_gx/mopao", + name: "yicipao", + path: "/wpm_gx/yicipao", meta: { - title: "磨抛", + title: "一次抛", // icon: "el-icon-cellphone", - perms: ["wpm_mp"], + perms: ["wpm_ycp"], }, - component: "wpm_gx/mopao", + component: "wpm_gx/yicipao", + }, + { + name: "saobianb", + path: "/wpm_gx/saobianb", + meta: { + title: "扫边B", + // icon: "el-icon-cellphone", + perms: ["wpm_sbb"], + }, + component: "wpm_gx/saobianb", + }, + { + name: "chengpinpao", + path: "/wpm_gx/chengpinpao", + meta: { + title: "成品抛", + // icon: "el-icon-cellphone", + perms: ["wpm_cpp"], + }, + component: "wpm_gx/chengpinpao", }, { name: "daojiao", diff --git a/src/views/wpm_gx/baipaopian.vue b/src/views/wpm_gx/baipaopian.vue new file mode 100644 index 00000000..53177c7c --- /dev/null +++ b/src/views/wpm_gx/baipaopian.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/wpm_gx/chengpinpao.vue b/src/views/wpm_gx/chengpinpao.vue new file mode 100644 index 00000000..a6e395e8 --- /dev/null +++ b/src/views/wpm_gx/chengpinpao.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index da7f6493..df4244e3 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -259,7 +259,7 @@ export default { that.$API.mtm.mgroup.list .req({ page: 0, search: that.mgroupName }) .then((res) => { - if (res.length != 1) { + if (res.length < 1) { that.$message.error("获取工段错误"); return; } diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue index 7a128e1e..6b38f4f3 100644 --- a/src/views/wpm_gx/inm.vue +++ b/src/views/wpm_gx/inm.vue @@ -177,7 +177,7 @@ export default { that.$API.mtm.mgroup.list .req({ page: 0, search: that.mgroupName }) .then((res) => { - if (res.length != 1) { + if (res.length < 1) { that.$message.error("获取工段错误"); return; } diff --git a/src/views/wpm_gx/jianbo.vue b/src/views/wpm_gx/jianbo.vue index dcb2e739..4ef26c3f 100644 --- a/src/views/wpm_gx/jianbo.vue +++ b/src/views/wpm_gx/jianbo.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "减薄", + mgroupName: "减薄A", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/jianbob.vue b/src/views/wpm_gx/jianbob.vue new file mode 100644 index 00000000..eafc95ae --- /dev/null +++ b/src/views/wpm_gx/jianbob.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue index 70498675..8f7236a7 100644 --- a/src/views/wpm_gx/mlogs.vue +++ b/src/views/wpm_gx/mlogs.vue @@ -182,7 +182,7 @@ export default { that.$API.mtm.mgroup.list .req({ page: 0, search: that.mgroupName }) .then((res) => { - if (res.length != 1) { + if (res.length < 1) { that.$message.error("获取工段错误"); return; } diff --git a/src/views/wpm_gx/mopao.vue b/src/views/wpm_gx/pingmo.vue similarity index 98% rename from src/views/wpm_gx/mopao.vue rename to src/views/wpm_gx/pingmo.vue index e983c6ef..1b2a0547 100644 --- a/src/views/wpm_gx/mopao.vue +++ b/src/views/wpm_gx/pingmo.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "磨抛", + mgroupName: "平磨", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue index 00a225f5..cd946423 100644 --- a/src/views/wpm_gx/saobian.vue +++ b/src/views/wpm_gx/saobian.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "扫边", + mgroupName: "扫边A", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/saobianb.vue b/src/views/wpm_gx/saobianb.vue new file mode 100644 index 00000000..bdf3145d --- /dev/null +++ b/src/views/wpm_gx/saobianb.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/wpm_gx/shaojie.vue b/src/views/wpm_gx/tuihuo.vue similarity index 98% rename from src/views/wpm_gx/shaojie.vue rename to src/views/wpm_gx/tuihuo.vue index 1939edab..cf62c481 100644 --- a/src/views/wpm_gx/shaojie.vue +++ b/src/views/wpm_gx/tuihuo.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "烧结", + mgroupName: "退火", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/yicipao.vue b/src/views/wpm_gx/yicipao.vue new file mode 100644 index 00000000..5ec87317 --- /dev/null +++ b/src/views/wpm_gx/yicipao.vue @@ -0,0 +1,62 @@ + + + From 65f450256199bcfc14832a3252ba7257bd0fad69 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 15 Aug 2024 13:57:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E7=99=BD=E6=8A=9B=E7=89=87-->=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20=20=E7=99=BD=E7=89=87=E6=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 6 +++--- src/views/wpm_gx/{baipaopian.vue => baipianpao.vue} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/views/wpm_gx/{baipaopian.vue => baipianpao.vue} (97%) diff --git a/src/config/route.js b/src/config/route.js index 5c1489eb..d00e0bdb 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1402,14 +1402,14 @@ const routes = [ component: "wpm_gx/qiepian", }, { - name: "baipaopian", - path: "/wpm_gx/baipaopian", + name: "baipianpao", + path: "/wpm_gx/baipianpao", meta: { title: "白片抛", // icon: "el-icon-files", perms: ["wpm_bpp"], }, - component: "wpm_gx/baipaopian", + component: "wpm_gx/baipianpao", }, { name: "saobian", diff --git a/src/views/wpm_gx/baipaopian.vue b/src/views/wpm_gx/baipianpao.vue similarity index 97% rename from src/views/wpm_gx/baipaopian.vue rename to src/views/wpm_gx/baipianpao.vue index 53177c7c..310eb320 100644 --- a/src/views/wpm_gx/baipaopian.vue +++ b/src/views/wpm_gx/baipianpao.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "白抛片", + mgroupName: "白片抛", mgroupId: "", }; }, From 7ea7051a885b6cd82dea74b8f57ff479ea5d6ac8 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 15 Aug 2024 13:58:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E6=9B=B4=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=97=B6=E5=8E=BB=E6=8E=89=20=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/user/pushSettings.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/userCenter/user/pushSettings.vue b/src/views/userCenter/user/pushSettings.vue index 2196f475..1bdf28d5 100644 --- a/src/views/userCenter/user/pushSettings.vue +++ b/src/views/userCenter/user/pushSettings.vue @@ -13,7 +13,7 @@
必须提供当前登录用户密码才能进行更改
- @@ -56,7 +56,7 @@ export default { if (reg1.test(value)) { callback(); }else{ - callback(new Error('请输入包含英文、数字、特殊符号（ @#$%^&.+=! ）的8位以上密码')); + callback(new Error('请输入包含英文、数字、特殊符号（ @#$%^&+=! ）的8位以上密码')); } }} ],