From c836b3f5458aff9ca2bb9ec47da34031ca336fff Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 27 Aug 2024 10:26:20 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=85=8D=E5=B8=AE=E7=AE=A1---->=E9=85=8D=E6=A3=92=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/productCheck.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qm/productCheck.vue b/src/views/qm/productCheck.vue index a46a8cce..f73b0c96 100644 --- a/src/views/qm/productCheck.vue +++ b/src/views/qm/productCheck.vue @@ -31,7 +31,7 @@ {{ workObj.count_sampling }} - + {{item.batch}}、 From c86ab8411e1b87863f2db6e3806a4ef6d944867b Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 27 Aug 2024 10:27:10 +0800 Subject: [PATCH 02/13] =?UTF-8?q?feat:=E5=85=89=E8=8A=AF=E5=BA=93=E5=AD=98?= =?UTF-8?q?=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 | 5 +- src/views/statistics/statistics_inm.vue | 252 ++++++++++++ src/views/statistics/statistics_saobian.vue | 421 ++++++++++++++++++++ 3 files changed, 674 insertions(+), 4 deletions(-) create mode 100644 src/views/statistics/statistics_inm.vue create mode 100644 src/views/statistics/statistics_saobian.vue diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue index 79d2f7f8..a1885073 100644 --- a/src/views/statistics/pass_num_gx.vue +++ b/src/views/statistics/pass_num_gx.vue @@ -244,10 +244,7 @@ export default { 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 03/13] =?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 04/13] =?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 @@