From 1793a41dfb650f5b1b6b7c90d3434e87b5a43609 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 26 Aug 2024 09:02:11 +0800 Subject: [PATCH 01/65] =?UTF-8?q?feat:=E9=BB=91=E5=8C=96=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_heihuadept.vue | 992 +++++++++++++++++++++++ 1 file changed, 992 insertions(+) create mode 100644 src/views/bigScreen/index_heihuadept.vue diff --git a/src/views/bigScreen/index_heihuadept.vue b/src/views/bigScreen/index_heihuadept.vue new file mode 100644 index 00000000..a6be8cfd --- /dev/null +++ b/src/views/bigScreen/index_heihuadept.vue @@ -0,0 +1,992 @@ + + + + From 28d482604303fa73fad35282835c9b5521aaa030 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 26 Aug 2024 09:59:02 +0800 Subject: [PATCH 02/65] =?UTF-8?q?feat:=E5=85=89=E5=AD=90=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E6=9E=90-=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/task_rate_gx.vue | 218 ++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 src/views/statistics/task_rate_gx.vue diff --git a/src/views/statistics/task_rate_gx.vue b/src/views/statistics/task_rate_gx.vue new file mode 100644 index 00000000..b96f23c5 --- /dev/null +++ b/src/views/statistics/task_rate_gx.vue @@ -0,0 +1,218 @@ + + + + From 8c3bafcc19d8282d82ab4a6e8c29e02b465c0246 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 26 Aug 2024 09:59:53 +0800 Subject: [PATCH 03/65] =?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=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 77 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/src/config/route.js b/src/config/route.js index 7b563ac6..ef7c67e2 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -2966,6 +2966,17 @@ const routes = [ perms: ["bigScreenP_dept"], }, children: [ + { + path: "/bigScreenP_heihua", + name: "bigScreenP_heihua", + meta: { + title: "黑化车间", + icon: "el-icon-trend-charts", + perms: ["bigScreenP_dept10"], + fullpage: true, + }, + component: "bigScreen/index_heihuadept.vue", + }, { path: "/bigScreenP_10", name: "bigScreenP_10", @@ -3181,6 +3192,72 @@ const routes = [ }, component: "statistics/stock_statistics.vue", }, + //合格数统计——光芯 + { + name: "pass_num_gx", + path: "/statistic/pass_num_gx", + meta: { + title: "合格数统计", + icon: "el-icon-DataAnalysis", + perms: ["pass_num_gx"], + }, + component: "statistics/pass_num_gx.vue", + }, + //任务进度统计——光芯 + { + name: "task_rate_gx", + path: "/statistic/task_rate_gx", + meta: { + title: "任务进度", + icon: "el-icon-DataAnalysis", + perms: ["task_rate_gx"], + }, + component: "statistics/task_rate_gx.vue", + }, + //库存统计——光芯 + { + path: "/statistic_inm", + name: "statistic_inm", + meta: { + title: "库存统计", + icon: "el-icon-trend-charts", + perms: ["statistic_inm_gx"], + }, + component: "statistics/statistics_inm.vue", + }, + //过程检验统计——光芯 + { + path: "/process_check_gx", + name: "process_check_gx", + meta: { + title: "过程检验统计", + icon: "el-icon-trend-charts", + perms: ["process_check_gx"], + }, + component: "statistics/process_check_gx.vue", + }, + //成品检验统计——光芯 + { + path: "/good_check_gx", + name: "good_check_gx", + meta: { + title: "成品检验统计", + icon: "el-icon-trend-charts", + perms: ["good_check_gx"], + }, + component: "statistics/good_check_gx.vue", + }, + //扫边车间数据汇总——光芯 + // { + // path: "/statistics_saobian", + // name: "statistics_saobian", + // meta: { + // title: "扫边车间统计", + // icon: "el-icon-trend-charts", + // perms: ["statistic_inm"], + // }, + // component: "statistics/statistics_saobian.vue", + // }, //综合查询 { name: "total_statistics", From fabfe947386ffe1ff5eef17ef194ff75bb8c3fec Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 26 Aug 2024 10:57:47 +0800 Subject: [PATCH 04/65] =?UTF-8?q?feat:=E5=85=89=E5=AD=90=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/good_check_gx.vue | 103 ++++++++++++++++++++++ src/views/statistics/process_check_gx.vue | 103 ++++++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 src/views/statistics/good_check_gx.vue create mode 100644 src/views/statistics/process_check_gx.vue diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue new file mode 100644 index 00000000..7583d0e3 --- /dev/null +++ b/src/views/statistics/good_check_gx.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/views/statistics/process_check_gx.vue b/src/views/statistics/process_check_gx.vue new file mode 100644 index 00000000..4322d295 --- /dev/null +++ b/src/views/statistics/process_check_gx.vue @@ -0,0 +1,103 @@ + + + + + From f810b751dd1115c6afc2f3694497f3c84a97108a Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 26 Aug 2024 10:58:50 +0800 Subject: [PATCH 05/65] =?UTF-8?q?feat:=E5=85=89=E5=AD=90=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/pass_num_gx.vue | 260 +++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 src/views/statistics/pass_num_gx.vue diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue new file mode 100644 index 00000000..79d2f7f8 --- /dev/null +++ b/src/views/statistics/pass_num_gx.vue @@ -0,0 +1,260 @@ + + + + From 3994d63728d0e685a040c0a8b63b0cc2ec3165b9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 26 Aug 2024 15:36:39 +0800 Subject: [PATCH 06/65] =?UTF-8?q?feat:=20base=20menu=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ops/menu.vue | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue index 53a9298d..67644e24 100644 --- a/src/views/ops/menu.vue +++ b/src/views/ops/menu.vue @@ -53,9 +53,9 @@ - 模块 - 页面 - 接口 + 模块 + 页面 + 接口 @@ -86,6 +86,11 @@ diff --git a/src/views/statistics/statistics_saobian.vue b/src/views/statistics/statistics_saobian.vue new file mode 100644 index 00000000..726b1b94 --- /dev/null +++ b/src/views/statistics/statistics_saobian.vue @@ -0,0 +1,421 @@ + + + + + From 97eab5f9a45a787004b60cd5eb32d79935c4a36b Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 27 Aug 2024 11:05:57 +0800 Subject: [PATCH 10/65] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=87=AA=E6=A3=80?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=90=88=E6=A0=BC=E9=A1=B9=E2=80=9D?= =?UTF-8?q?=E5=B0=8F=E5=B4=A9=E8=BE=B9=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/mlogb_check.vue | 96 +++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 3 deletions(-) diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue index 2fca83e7..1daa9581 100644 --- a/src/views/wpm_gx/mlogb_check.vue +++ b/src/views/wpm_gx/mlogb_check.vue @@ -111,6 +111,18 @@ /> + + + + + + + + @@ -184,12 +250,27 @@ export default { count_n_qp: 0, count_n_swen: 0, count_n_bb: 0, + count_n_xbb:0, count_n_md: 0, count_n_xh: 0, count_n_ps: 0, count_n_qt: 0, count_n_wm: 0, + count_n_zq:0 }, + notokOptions:[ + {name:"划伤",value:'count_n_hs'}, + {name:"气泡",value:'count_n_qp'}, + {name:"水纹",value:'count_n_swen'}, + {name:"崩边",value:'count_n_bb'}, + {name:"小崩边",value:'count_n_xbb'}, + {name:"麻点",value:'count_n_md'}, + {name:"划伤",value:'count_n_xh'}, + {name:"破损",value:'count_n_ps'}, + {name:"其他",value:'count_n_qt'}, + {name:"雾面",value:'count_n_wm'}, + {name:"棕圈",value:'count_n_zq'}, + ], //验证规则 rules: { batch: [ @@ -208,6 +289,7 @@ export default { ], }, options: [], + notokList:[], materialOptions: [], visible: false, isSaveing: false, @@ -225,15 +307,23 @@ export default { Object.assign(this.form, data); console.log(this.form); }, + notok_add(){ + this.notokList.push({file:'',value:0}); + }, + notok_del(index){ + this.notokList.splice(index, 1) + }, countChange() { this.form.count_notok = this.form.count_n_hs + this.form.count_n_qp + this.form.count_n_swen + this.form.count_n_bb + + this.form.count_n_xbb + this.form.count_n_md + this.form.count_n_xh + this.form.count_n_ps + + this.form.count_n_zq + this.form.count_n_qt + this.form.count_n_wm; this.form.count_ok = this.form.count_real - this.form.count_notok; @@ -250,9 +340,11 @@ export default { this.form.count_n_qp + this.form.count_n_swen + this.form.count_n_bb + + this.form.count_n_xbb + this.form.count_n_md + this.form.count_n_xh + this.form.count_n_ps + + this.form.count_n_zq + this.form.count_n_qt + this.form.count_n_wm; let sum = this.form.count_ok + this.form.count_notok; @@ -269,9 +361,7 @@ export default { that.isSaveing = false; }); } else { - this.$message.error( - "使用数量与合格数不合格数数量不对等" - ); + this.$message.error("使用数量与合格数不合格数数量不对等"); } } }); From 02dfecfcadfad7593ecdab4665d78ee14ad796a3 Mon Sep 17 00:00:00 2001 From: Li xia <2309368887@qq.com> Date: Tue, 27 Aug 2024 14:03:14 +0800 Subject: [PATCH 11/65] =?UTF-8?q?fest:"=E5=A4=A7=E5=B1=8F=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigScreen/enpComponents/pollutant.vue | 91 +++++++++++- .../bigScreen/enpComponents/transport.vue | 42 +++--- src/views/bigScreen/enpComponents/video.vue | 140 +++++++++++++----- src/views/em/equipment.vue | 4 +- src/views/em/equipment_form.vue | 137 +++++------------ src/views/em/equipmentjk.vue | 35 +---- 6 files changed, 260 insertions(+), 189 deletions(-) diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index 4330aaac..2c19a7fd 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -223,6 +223,21 @@
TSP： 0.000 m³/h
 + +
+
+
+
+ 监控设备 +
+
+ + {{ eqj.name }} +
+ + +
+ @@ -255,6 +270,7 @@ export default { eqs: {}, eqc: {}, eqz: {}, + eqj: {}, pollutantDetail: false, query: {}, apiObj: this.$API.enp.drain.list, @@ -316,7 +332,8 @@ export default { } }, mounted() { - + let that = this; + that.init(); }, methods: { initDom() { @@ -363,7 +380,13 @@ export default { that.getDetailData(2, id); } else if (res.type == 30) { //治理设备 that.eqz = res; + that.getDetailData(3, id); + } + else if (res.type == 50) { //监控设备 + debugger; + this.login(res);//监控摄像头 + that.eqj = res; } }) }); @@ -425,6 +448,70 @@ export default { this.pollutantDetail = false; this.detailItem = {}; }, + + //监控摄像头 + //初始化插件 + init() { + + WebVideoCtrl.I_InsertOBJECTPlugin("divPlugin"); + //初始化 + alert(1) + WebVideoCtrl.I_InitPlugin("divPlugin", 200, 200, { + iWndowType: 2, //分裂系数N*N + bWndFull: true, //双击全屏 + cbInitPluginCompleted: function () { + alert(1) + WebVideoCtrl.I_InsertOBJECTPlugin("divPlugin").then(() => { + // 检查插件是否最新 + WebVideoCtrl.I_CheckPluginVersion().then((bFlag) => { + if (bFlag) { + alert("检测到新的插件版本，双击开发包目录里的HCWebSDKPlugin.exe升级！"); + } + }); + }, () => { + alert("插件初始化失败，请确认是否已安装插件；如果未安装，请双击开发包目录里的HCWebSDKPlugin.exe安装！"); + }); + + }, + }); + + }, + + //摄像头登录 + login(jkdata){ + + WebVideoCtrl.I_Login( + jkdata.ip, + 1, + jkdata.port, + jkdata.login_name, + jkdata.login_pwd, + { + async: true, + cgi: 1, + success: (xmlDoc) => { + console.log("登录成功", xmlDoc); + //预览 + WebVideoCtrl.I_StartRealPlay(szIp + "_" + ipPort, { + success: () => { + console.log("预览成功"); + }, + }); + }, + error: (xmlDoc) => { + console.log("登录失败", xmlDoc); + }, + } + ); + } + } } - \ No newline at end of file + + diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue index 43e64cb7..78d217c7 100644 --- a/src/views/bigScreen/enpComponents/transport.vue +++ b/src/views/bigScreen/enpComponents/transport.vue @@ -58,27 +58,27 @@ background-color: rgb(4, 50, 83); box-shadow: inset 0px 0px 30px 15px rgb(7, 79, 109)" v-model="dialogFormVisible" title="车辆运输台账详情" > - {{ ysdata.crkbh }} - {{ ysdata.dzbh }} - {{ ysdata.tgfs }} - {{ ysdata.jcsj }} - {{ ysdata.ccsj }} - {{ ysdata.cllx }} - {{ ysdata.clys }} - {{ ysdata.cph }} - {{ ysdata.zcdjsj }} - {{ ysdata.cpsbdm }} - {{ ysdata.clppxh }} - {{ ysdata.fdjhm }} - {{ ysdata.rllx }} - {{ ysdata.pfjd }} - {{ ysdata.syxz }} - {{ ysdata.lwzt }} - {{ ysdata.jcyshwmc }} - {{ ysdata.jchwl }} - {{ ysdata.cchwmc }} - {{ ysdata.cchwl }} - {{ ysdata.cdmc }} + {{ ysdata.crkbh }} + {{ ysdata.dzbh }} + {{ ysdata.tgfs }} + {{ ysdata.jcsj }} + {{ ysdata.ccsj }} + {{ ysdata.cllx }} + {{ ysdata.clys }} + {{ ysdata.cph }} + {{ ysdata.zcdjsj }} + {{ ysdata.cpsbdm }} + {{ ysdata.clppxh }} + {{ ysdata.fdjhm }} + {{ ysdata.rllx }} + {{ ysdata.pfjd }} + {{ ysdata.syxz }} + {{ ysdata.lwzt }} + {{ ysdata.jcyshwmc }} + {{ ysdata.jchwl }} + {{ ysdata.cchwmc }} + {{ ysdata.cchwl }} + {{ ysdata.cdmc }}
diff --git a/src/views/bigScreen/enpComponents/video.vue b/src/views/bigScreen/enpComponents/video.vue index ac64f767..88ce17b6 100644 --- a/src/views/bigScreen/enpComponents/video.vue +++ b/src/views/bigScreen/enpComponents/video.vue @@ -3,18 +3,29 @@
- 登录 - 预览 - 停止预览 - 登出设备 - 销毁设备 - 初始化设备 +
+ 登录 + 预览 + 停止预览 + 登出设备 + 销毁设备 + 初始化设备 + + + + + +
+
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue index f5760a78..217eeba0 100644 --- a/src/views/em/equipment.vue +++ b/src/views/em/equipment.vue @@ -159,7 +159,7 @@ - + - + --> - + @@ -171,9 +171,12 @@ const defaultForm = { process: null, sort: 1, out_rate: 100, + material_in:'', + material_out:'', + hour_work:0, batch_bind: true, - is_autotask: true, - is_count_utask: false, + // is_autotask: true, + // is_count_utask: false, }; export default { props: { @@ -185,7 +188,7 @@ export default { loading: false, mode: "add", //表单数据 - form: defaultForm, + form: Object.assign({}, defaultForm), //验证规则 rules: { process: [ diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 49c0d453..d1e04184 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -211,11 +211,14 @@ \ No newline at end of file diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue new file mode 100644 index 00000000..c3d8a9f8 --- /dev/null +++ b/src/views/fac_cal/mpointstat.vue @@ -0,0 +1,221 @@ + + + + diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue new file mode 100644 index 00000000..e02bee2c --- /dev/null +++ b/src/views/fac_cal/taskresult.vue @@ -0,0 +1,60 @@ + + \ No newline at end of file diff --git a/src/views/fac_cal/xscript.vue b/src/views/fac_cal/xscript.vue new file mode 100644 index 00000000..80fc545e --- /dev/null +++ b/src/views/fac_cal/xscript.vue @@ -0,0 +1,224 @@ + + From 86dc38f847c2a8a36f55528a0d497f10c1db5e25 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Aug 2024 11:47:32 +0800 Subject: [PATCH 25/65] =?UTF-8?q?fix:=20routeForm=20is=5Fautotask=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BAtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue index bed5e2ec..1a80117d 100644 --- a/src/views/mtm/route_form.vue +++ b/src/views/mtm/route_form.vue @@ -175,7 +175,7 @@ const defaultForm = { material_out:'', hour_work:0, batch_bind: true, - // is_autotask: true, + is_autotask: true, // is_count_utask: false, }; export default { From dbc65739ce9f7d15bb914511c0e3029eb87ae50f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Aug 2024 12:51:20 +0800 Subject: [PATCH 26/65] =?UTF-8?q?feat:=20=E8=AE=A1=E7=AE=97=E5=85=AC?= =?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5=E5=8A=A0=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/mpoint_form.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index 2a999594..ea3b5f15 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -161,6 +161,8 @@ From 06bbc7c77687bbfe2c921c319e5854dbbbcd3e1c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Aug 2024 12:52:06 +0800 Subject: [PATCH 27/65] =?UTF-8?q?fix:=20=E8=AE=A1=E7=AE=97=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/fac_cal/mpointstat.vue | 7 ++++--- src/views/fac_cal/taskresult.vue | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue index c3d8a9f8..6f658343 100644 --- a/src/views/fac_cal/mpointstat.vue +++ b/src/views/fac_cal/mpointstat.vue @@ -56,11 +56,12 @@ - + + - + - + diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue index e02bee2c..d63d2f62 100644 --- a/src/views/fac_cal/taskresult.vue +++ b/src/views/fac_cal/taskresult.vue @@ -11,7 +11,7 @@
- + @@ -22,6 +22,15 @@ + + + {{ current_tr.date_created }} + {{ current_tr.date_created }} + {{ current_tr.status }} + {{ current_tr.result }} + {{ current_tr.traceback }} + + diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue new file mode 100644 index 00000000..a3ea4d43 --- /dev/null +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -0,0 +1,352 @@ + + + + diff --git a/src/views/wpm_gx/fmlog_form.vue b/src/views/wpm_gx/fmlog_form.vue new file mode 100644 index 00000000..fa9d1006 --- /dev/null +++ b/src/views/wpm_gx/fmlog_form.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue new file mode 100644 index 00000000..1c1904bc --- /dev/null +++ b/src/views/wpm_gx/fmlogs.vue @@ -0,0 +1,239 @@ + + + diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index 4c2e6882..67bb6416 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -37,7 +37,7 @@
放行审批 @@ -69,7 +69,7 @@
新增 编辑 @@ -251,7 +251,7 @@ 检验 diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue index 3951f11f..1988896a 100644 --- a/src/views/wpm_gx/mtask.vue +++ b/src/views/wpm_gx/mtask.vue @@ -8,23 +8,10 @@ row-key="id" :params="params" > - - + + - + @@ -33,31 +20,50 @@ - + - + + + + + diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue index cd946423..b6304bf0 100644 --- a/src/views/wpm_gx/saobian.vue +++ b/src/views/wpm_gx/saobian.vue @@ -32,7 +32,7 @@ - + From eac434c0ea756bd4a3f436a31c18997509f07b13 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 5 Sep 2024 14:40:49 +0800 Subject: [PATCH 54/65] fix: --- src/views/wpm_gx/check_form.vue | 2 +- src/views/wpm_gx/mlog_detail.vue | 6 ++++++ src/views/wpm_gx/mlog_form.vue | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_gx/check_form.vue b/src/views/wpm_gx/check_form.vue index 4cdbf452..8c8c25f5 100644 --- a/src/views/wpm_gx/check_form.vue +++ b/src/views/wpm_gx/check_form.vue @@ -400,7 +400,7 @@ export default { if(this.form.type2==10){//抽检 this.form.count_sampling_ok = this.form.count_sampling - this.form.count_notok; this.count_ok_rate = ((this.form.count_sampling_ok/this.form.count_sampling)*100).toFixed(2); - }else{//全检 + }else if(this.form.type2==20){//全检 this.form.count_ok = this.form.count - this.form.count_notok; this.count_ok_rate = ((this.form.count_ok/this.form.count)*100).toFixed(2); } diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index a2aca7d7..e819dd94 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -10,6 +10,12 @@ {{ + mlogItem.routepack_name + }} + {{ + mlogItem.material_in_name + }} + {{ mlogItem.material_out_name }} {{ diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 1d0bc810..af70a6ed 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -312,6 +312,7 @@ export default { }); }, getEquipment() { + let that = this; this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => { this.options = res; }); From a57b58c29c0d583f10a9a9cde28564df15f952c5 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 5 Sep 2024 14:51:25 +0800 Subject: [PATCH 55/65] =?UTF-8?q?fix:=E5=A4=96=E5=8D=8F=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pum/supplier.vue | 8 +++----- src/views/pum/supplier_form.vue | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/pum/supplier.vue b/src/views/pum/supplier.vue index 29f6984d..87f6bed2 100644 --- a/src/views/pum/supplier.vue +++ b/src/views/pum/supplier.vue @@ -43,11 +43,9 @@ - + + +