From d8d6f29b934923be85d625f58423965dbae5bb50 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 13 Feb 2025 10:23:10 +0800 Subject: [PATCH 01/26] =?UTF-8?q?feat:=20base=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E8=83=8C=E6=99=AF=E5=9B=BE=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 3ccf9604..f00c4c1d 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -241,7 +241,7 @@ export default { } .login_adv { - width: 40%; + width: 50%; background-color: #555; background-size: cover; background-position: center center; From 955807958883ec2b50b0968158c54d3fdb458b5d Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 13 Feb 2025 10:26:38 +0800 Subject: [PATCH 02/26] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E4=B8=8D=E9=BB=98=E8=AE=A4=E8=B4=A6=E6=88=B7=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/passwordForm.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 90bf35c5..43c23d5c 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -67,8 +67,6 @@ export default { visitorsdialog: false, visitorform: {}, form: { - user: "admin", - password: "admin", autologin: false, }, rules: { From 0ddb8ef9d9edbbe46dfc97fdee0bbf1f15726aab Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 13 Feb 2025 11:02:27 +0800 Subject: [PATCH 03/26] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogs.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue index d8dca1ab..f2252ef2 100644 --- a/src/views/wpm_bx/mlogs.vue +++ b/src/views/wpm_bx/mlogs.vue @@ -37,11 +37,13 @@ label="#" type="index" width="50" + fixed > Date: Thu, 13 Feb 2025 11:04:30 +0800 Subject: [PATCH 04/26] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E5=9B=BA=E5=AE=9A=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E7=BC=96=E8=BE=91=E5=88=97=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9A=84=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 5 ++++- src/views/wpm_bx/mlogbw_check.vue | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index fdc7ed37..75fa6c89 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -300,7 +300,7 @@ 详情 @@ -356,6 +356,7 @@ ref="checkDialogSingle" :mlogb="mlogb" :wm = "wm" + :isSubmit="isSubmit" :batchNumber="batchNumber" :handle_user="handle_user" :handle_date="handle_date" @@ -482,6 +483,7 @@ export default { qct:null, defectlist:[], batchNumber:'', + isSubmit:false, }; }, mounted() { @@ -597,6 +599,7 @@ export default { let that = this; that.mlogb = row.id; that.wm = row.wm_in; + that.isSubmit = that.mlogItem.submit_time == null ? false : true; that.batchNumber = row.batch; that.handle_date=that.mlogItem.handle_date; that.handle_user = that.mlogItem.handle_user; diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index 2f0bb8d6..98b5fd93 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -16,7 +16,7 @@ :addTemplate="addTemplate" placeholder="暂无数据" > - + - + - + - + @@ -843,13 +779,12 @@ export default { this.$refs.table_mtask.queryData(this.queryMtask); }, handover_submit(row) { - this.$API.wpm.handover.submit - .req(row.id) - .then((res) => { - this.$refs.table_handover.refresh(); - this.$message.success("操作成功"); - }) - .catch((e) => {}); + let that = this; + that.$API.wpm.handover.submit.req(row.id).then((res) => { + that.$refs.table_wm.refresh(); + that.$refs.table_handover.refresh(); + that.$message.success("操作成功"); + }).catch((e) => {}); }, getMlogs() { this.$API.wpm.mlog.list @@ -895,6 +830,7 @@ export default { } }, table_submit(row) { + let that = this; let lengths = row.mlogs.length, infoText = ""; if (lengths > 0) { @@ -902,18 +838,16 @@ export default { } else { infoText = "该任务没有日志，确定提交吗？"; } - this.$confirm(infoText, "提示", { + that.$confirm(infoText, "提示", { type: "warning", }).then(() => { - this.$API.pm.mtask.submit - .req(row.id) - .then((res) => { - this.$message.success("操作成功"); - this.$refs.table_wm.refresh(); - this.$refs.table_mtask.refresh(); - this.mtaskClick(this.currentMtask); - }) - .catch((err) => {}); + that.$API.pm.mtask.submit.req(row.id).then((res) => { + that.$message.success("操作成功"); + that.$refs.table_wm.refresh(); + that.$refs.table_mtask.refresh(); + that.mtaskClick(that.currentMtask); + that.currentMtask.state = 20 + }).catch((err) => {}); }); }, // table_submit(row) { @@ -965,18 +899,19 @@ export default { this.getMlogs(); }, mlog_submit(row) { - this.mlogHandleLoading = true; - this.$API.wpm.mlog.submit + let that = this; + that.mlogHandleLoading = true; + that.$API.wpm.mlog.submit .req(row.id) .then((res) => { - this.$message.success("操作成功"); - this.mtaskClick(this.currentMtask); - this.$refs.table_wm.refresh(); - this.$refs.table_mtask.refresh(); - this.mlogHandleLoading = false; + that.$message.success("操作成功"); + that.mtaskClick(that.currentMtask); + that.$refs.table_wm.refresh(); + that.$refs.table_mtask.refresh(); + that.mlogHandleLoading = false; }) .catch((err) => { - this.mlogHandleLoading = false; + that.mlogHandleLoading = false; }); }, //从生产日志生成交接记录 diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue index 7e190176..cdcf1076 100644 --- a/src/views/wpm/mlog_dept6.vue +++ b/src/views/wpm/mlog_dept6.vue @@ -90,8 +90,8 @@ ref="tableprocess" row-key="id" stripe - :hideDo="hideDo" - :data="processList" + :params="paramsProcess" + :apiObj="apiObjProcess" @row-click="itemClick" > { - that.processList = res.results; - }); + that.clickRow = row; + that.paramsProcess.start_date = row.start_date; + that.paramsProcess.end_date = row.end_date; + that.paramsProcess.utask = row.utask; + that.apiObjProcess = that.$API.pm.mtask.list; + that.$refs.tableprocess.refresh(); }, //工序详情 itemClick(row) { @@ -522,26 +524,23 @@ export default { that.$confirm(infoText, "提示", { type: "warning", }).then(() => { - that.$API.pm.mtask.submit - .req(row.id) - .then((res) => { - that.$message.success("操作成功"); - that.$refs.table_mtask.refresh(); - that.mtaskClick(that.currentMtask); - }) - .catch((err) => {}); + that.$API.pm.mtask.submit.req(row.id).then((res) => { + that.$message.success("操作成功"); + that.$refs.table.refresh(); + that.$refs.table_wm.refresh(); + that.$refs.tableprocess.refresh(); + that.$refs.table_handover.refresh(); + that.mtaskClick(that.currentMtask); + }).catch((err) => {}); }); }, handover_submit(row) { let that = this; - that.$API.wpm.handover.submit - .req(row.id) - .then((res) => { - that.$message.success("操作成功"); - that.$refs.table_handover.refresh(); - that.$refs.table_wm.refresh(); - }) - .catch((err) => {}); + that.$API.wpm.handover.submit.req(row.id).then((res) => { + that.$message.success("操作成功"); + that.$refs.table_handover.refresh(); + that.$refs.table_wm.refresh(); + }).catch((err) => {}); }, //从生产日志生成交接记录 addHandover() { @@ -564,6 +563,14 @@ export default { this.$refs.checkDrawers.open(); }); }, + showDrawerClose(){ + let that = this; + that.visibleDrawer = false; + that.$refs.table.refresh(); + that.$refs.table_wm.refresh(); + that.$refs.tableprocess.refresh(); + that.$refs.table_handover.refresh(); + }, }, }; diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue index f8fcb3da..520921fb 100644 --- a/src/views/wpm/mlog_dept7.vue +++ b/src/views/wpm/mlog_dept7.vue @@ -164,10 +164,7 @@ type="primary" icon="el-icon-plus" @click="addMlog" - v-if=" - currentMtask && - currentMtask.state == 20 - " + v-if="currentMtask &¤tMtask.state == 20" v-auth="'mlog.create'" >新增 @@ -193,15 +190,7 @@ min-width="120" > 编辑 删除 提交 撤回 - @@ -813,13 +757,12 @@ export default { this.$refs.table_mtask.queryData(this.queryMtask); }, handover_submit(row) { - this.$API.wpm.handover.submit - .req(row.id) - .then((res) => { - this.$refs.table_handover.refresh(); - this.$message.success("操作成功"); - }) - .catch((e) => {}); + let that = this; + that.$API.wpm.handover.submit.req(row.id).then((res) => { + that.$refs.table_handover.refresh(); + that.$refs.table_wm.refresh(); + that.$message.success("操作成功"); + }).catch((e) => {}); }, getMlogs() { this.$API.wpm.mlog.list @@ -839,6 +782,7 @@ export default { this.getMlogs(); }, mtask_submit(row) { + let that = this; let lengths = row.mlogs.length, infoText = ""; if (lengths > 0) { @@ -846,17 +790,16 @@ export default { } else { infoText = "该任务没有日志，确定提交吗？"; } - this.$confirm(infoText, "提示", { + that.$confirm(infoText, "提示", { type: "warning", }).then(() => { - this.$API.pm.mtask.submit - .req(row.id) - .then((res) => { - this.$message.success("操作成功"); - this.$refs.table_mtask.refresh(); - this.mtaskClick(this.currentMtask); - }) - .catch((err) => {}); + that.$API.pm.mtask.submit.req(row.id).then((res) => { + that.$message.success("操作成功"); + that.$refs.table_mtask.refresh(); + that.$refs.table_wm.refresh(); + that.mtaskClick(that.currentMtask); + that.currentMtask.state = 20 + }).catch((err) => {}); }); }, handleSaveSuccess() { @@ -871,17 +814,19 @@ export default { }); }, mlog_submit(row) { - this.mlogHandleLoading = true; - this.$API.wpm.mlog.submit + let that = this; + that.mlogHandleLoading = true; + that.$API.wpm.mlog.submit .req(row.id) .then((res) => { - this.$message.success("操作成功"); - this.mtaskClick(this.currentMtask); - this.$refs.table_wm.refresh(); - this.mlogHandleLoading = false; + that.$message.success("操作成功"); + that.mtaskClick(that.currentMtask); + that.$refs.table_wm.refresh(); + that.getMlogs(); + that.mlogHandleLoading = false; }) .catch((err) => { - this.mlogHandleLoading = false; + that.mlogHandleLoading = false; }); }, //从生产日志生成交接记录 From 93ac96ddc29b390239650808e4a4e4c945371d33 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 19 Feb 2025 09:11:01 +0800 Subject: [PATCH 23/26] =?UTF-8?q?fix:=E5=85=89=E5=AD=90=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=B8=AE=E7=AE=A1=E7=BB=BC=E5=90=88=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/statistics_bang.vue | 787 +++++++++++++++++++---- src/views/statistics/statistics_guan.vue | 533 ++++++++++----- 2 files changed, 1044 insertions(+), 276 deletions(-) diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue index fa415af0..81dcfc56 100644 --- a/src/views/statistics/statistics_bang.vue +++ b/src/views/statistics/statistics_bang.vue @@ -79,11 +79,6 @@ {{ scope.row.data.棒料成型_count_n_zw }} - - - - + - + - - - - - - @@ -156,7 +141,17 @@ {{ scope.row.data.七车间入库_合格率 }} - + + + + + + + @@ -166,34 +161,14 @@ {{ scope.row.data.七车间入库_count_n_qp }} - - - - - - - + - - - - - - @@ -229,14 +204,120 @@ {{ scope.row.data.六车间_平头_count_real }} - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -255,14 +336,119 @@ {{ scope.row.data.六车间_粘铁头_count_use }} + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,14 +472,39 @@ {{ scope.row.data.六车间_粗中细磨_合格率 }} - + - + + + + + + + + + + + + + + + + @@ -301,19 +512,74 @@ {{ scope.row.data.六车间_粗中细磨_count_n_dl }} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -329,57 +595,137 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -388,14 +734,119 @@ {{ scope.row.data.六车间_开槽_count_use }} - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,54 +860,136 @@ - + + @@ -464,26 +997,16 @@ {{ scope.row.data.成品检验_count }} - + - - - - + - - - + + + - - - - - - - - + + + + + + + @@ -128,19 +132,14 @@ {{ scope.row.data.十车间入库_抽检合格率 }} - + - + - - - @@ -148,19 +147,9 @@ {{ scope.row.data.十车间入库_count_n_dl }} - + - - - - - - @@ -168,9 +157,9 @@ {{ scope.row.data.十车间入库_count_n_dxt }} - + @@ -178,11 +167,6 @@ {{ scope.row.data.十车间入库_count_n_qx }} - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -323,7 +332,7 @@ - + + + + + + + + + + + + + + + + - + @@ -349,15 +383,75 @@ {{ scope.row.data.六车间_开槽_count_n_dl }} - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + - + - + - + - - - - - - - - - - - - - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -478,31 +748,6 @@ {{ scope.row.data.成品检验_合格率 }} - - - - - - - - - - - - - - -