From bd3e4b481f683f65f8bd56b5e318194350d6df2a Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Mon, 1 Apr 2024 09:13:23 +0800 Subject: [PATCH 1/9] youhua --- .../components/parameterSetDialog.vue | 213 +++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index 626dfa7..bbb4bb8 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -800,6 +800,93 @@ +
取 消 @@ -992,6 +1079,20 @@ export default { ], }, upOptions: [], + //网络适配器 + //上位机信息 + inetComputer: { + ip: "", + subnetMask: "", + gateway: "", + dns: "", + }, + inetrulse: { + ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }], + port: [{ required: true, message: "请输入端口号", trigger: "blur" }], + }, + inetLoading: false, + inetSetLoading: false, }; }, mounted() {}, @@ -1132,6 +1233,14 @@ export default { this.i = 0; this.timer = null; }, + //上位机重置数据 + inethandleClick() { + this.inetComputer = {}; + this.lookTime = ""; + clearInterval(this.timer); + this.i = 0; + this.timer = null; + }, //id重置数据 idhandleClick() { this.idParameter = {}; @@ -1750,7 +1859,100 @@ export default { }) .catch((err) => {}); }, - + //网络适配器 + //--act=cma [0xA7] --flag=[Request Set Flag, default is set=1, 0: request] --ip=[IP Address] --cmaport=[CMA Port] --domain=[Domain] + //--act=inet --flag=[Request Set Flag, default is request=0, 1: set] --rf=[Request Flag] --ip=[IP] --subnetMask=[Subnet Mask] --gateway=[Gateway] + inetSearch() { + if (this.rowData.isonline || this.rowData.onlinestatus === 1) { + this.inetLoading = true; + let params = [ + { + name: "act", + value: "inet", + }, + { + name: "flag", + value: 0, + }, + { + name: "rf", + value: 15, + }, + { + name: "ip", + value: "", + }, + { + name: "subnetMask", + value: "", + }, + { + name: "gateway", + value: "", + }, + { + name: "dns", + value: "", + }, + ]; + this.setTermFn(params); + } else { + this.$message({ + duration: 1500, + showClose: true, + message: "装置下线，发送指令失败", + type: "error", + }); + } + }, + //网络适配器设置 + inetSet() { + if (this.rowData.isonline || this.rowData.onlinestatus === 1) { + this.$refs.inetFormref.validate((valid) => { + console.log(valid); + if (valid) { + this.inetSetLoading = true; + let params = [ + { + name: "act", + value: "cma", + }, + { + name: "flag", + value: 1, + }, + { + name: "rf", + value: 255, + }, + { + name: "ip", + value: this.inetComputer.ip, + }, + { + name: "subnetMask", + value: this.inetComputer.subnetMask, + }, + { + name: "gateway", + value: this.inetComputer.gateway, + }, + ]; + this.setTermFn(params); + } else { + console.log("error submit!!"); + return false; + } + }); + } else { + this.$message({ + duration: 1500, + showClose: true, + message: "装置下线，发送指令失败", + type: "error", + }); + } + }, getinfo() { getTermCameraRequest({ requestid: this.requestid }) .then((res) => { @@ -1764,6 +1966,8 @@ export default { this.sampSetLoading = false; this.upperLoading = false; this.upperSetLoading = false; + this.inetLoading = false; + this.inetSetLoading = false; this.idLoading = false; this.idSetLoading = false; this.statusLoading = false; @@ -1786,6 +1990,8 @@ export default { this.samplingForm = JSON.parse(res.data.data); //ip地址解析开始 this.upperComputer = JSON.parse(res.data.data); + //网络适配器结果 + this.inetComputer = JSON.parse(res.data.data); //修改cmdid this.idParameter = JSON.parse(res.data.data); this.waterForm = JSON.parse(res.data.data); @@ -1835,6 +2041,8 @@ export default { this.sampSetLoading = false; this.upperLoading = false; this.upperSetLoading = false; + this.inetLoading = false; + this.inetSetLoading = false; this.idLoading = false; this.idSetLoading = false; this.statusLoading = false; @@ -1967,6 +2175,7 @@ export default { this.samplingForm = {}; this.deviceTimeForm = {}; this.upperComputer = {}; + this.inetComputer = {}; this.idParameter = {}; this.zjidParameter = {}; this.gpsForm = {}; @@ -1982,6 +2191,8 @@ export default { this.sampSetLoading = false; this.upperLoading = false; this.upperSetLoading = false; + this.inetLoading = false; + this.inetSetLoading = false; this.idLoading = false; this.idSetLoading = false; this.statusLoading = false; From 95bc9d09a4157370dcdf3449b0e12c268e4c70a1 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Tue, 2 Apr 2024 10:24:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/parameterSetDialog.vue | 15 +++++++--- .../components/videoCapture.vue | 29 ++++++++++++++++++- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index bbb4bb8..8c8fefb 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -800,7 +800,7 @@
- +
取 消 @@ -1086,6 +1092,7 @@ export default { subnetMask: "", gateway: "", dns: "", + phoneNum: "", }, inetrulse: { ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }], @@ -1861,7 +1868,7 @@ export default { }, //网络适配器 //--act=cma [0xA7] --flag=[Request Set Flag, default is set=1, 0: request] --ip=[IP Address] --cmaport=[CMA Port] --domain=[Domain] - //--act=inet --flag=[Request Set Flag, default is request=0, 1: set] --rf=[Request Flag] --ip=[IP] --subnetMask=[Subnet Mask] --gateway=[Gateway] + //--act=inet --flag=[Request Set Flag, default is request=0, 1: set] --rf=[Request Flag] --ip=[IP] --subnetMask=[Subnet Mask] --gateway=[Gateway] --dns inetSearch() { if (this.rowData.isonline || this.rowData.onlinestatus === 1) { this.inetLoading = true; @@ -1876,7 +1883,7 @@ export default { }, { name: "rf", - value: 15, + value: 31, }, { name: "ip", diff --git a/src/views/photographicDevice/components/videoCapture.vue b/src/views/photographicDevice/components/videoCapture.vue index f264f46..c147a49 100644 --- a/src/views/photographicDevice/components/videoCapture.vue +++ b/src/views/photographicDevice/components/videoCapture.vue @@ -206,6 +206,32 @@ export default { name: "VGA", }, ], //分辨率 + zzratiolist: [ + { + id: 1, + name: "QVGA", + }, + { + id: 2, + name: "VGA", + }, + { + id: 3, + name: "480p;", + }, + { + id: 4, + name: "720P", + }, + { + id: 5, + name: "1080P", + }, + { + id: 6, + name: "其它", + }, + ], //分辨率 selaccess: "", //选中的通道 capturenr: {}, //查询后的内容 setForm: { @@ -259,7 +285,8 @@ export default { getRatio() { getResolutionRatio({ type: 1 }) .then((res) => { - this.ratiolist = this.hnratiolist; + //this.ratiolist = this.hnratiolist; + this.ratiolist = this.zzratiolist; this.$set(this.setForm, "videoFormat", this.ratiolist[0].id); }) .catch((err) => {}); From c15df590bd34d2a1574e84017e666b9e3e9b8fbf Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Tue, 2 Apr 2024 13:58:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=99=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photographicDevice/components/parameterSetDialog.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index 8c8fefb..b7c8a8f 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -816,7 +816,7 @@ > @@ -840,7 +840,7 @@ @@ -1092,7 +1092,7 @@ export default { subnetMask: "", gateway: "", dns: "", - phoneNum: "", + phoneNumber: "", }, inetrulse: { ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }], From e8074e74f1ede6f2d709792f1014367f54172d28 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Tue, 2 Apr 2024 14:27:44 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=A6=BB=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/photographicDevice/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue index af080a3..ad106e2 100644 --- a/src/views/photographicDevice/index.vue +++ b/src/views/photographicDevice/index.vue @@ -150,13 +150,17 @@ min-width="90" /> + + 在线 + 离线 + Date: Tue, 2 Apr 2024 15:22:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photographicDevice/components/workStatus.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/photographicDevice/components/workStatus.vue b/src/views/photographicDevice/components/workStatus.vue index ad9beb6..b028d80 100644 --- a/src/views/photographicDevice/components/workStatus.vue +++ b/src/views/photographicDevice/components/workStatus.vue @@ -265,11 +265,17 @@ export default { pageindex: this.page, pagesize: this.pageSize, }).then((res) => { - this.listData = res.data.list; - this.total = res.data.total; - this.$nextTick(() => { - this.loading = false; - }); + if (res.code == 200) { + this.listData = res.data.list; + this.total = res.data.total; + this.$nextTick(() => { + this.loading = false; + }); + } else { + this.$nextTick(() => { + this.loading = false; + }); + } }); }, //点击分页 From ad9811ab72dc7d6a148acd55b72e41ed405cef32 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Wed, 3 Apr 2024 09:36:27 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/parameterSetDialog.vue | 59 +++++++++++++++++-- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index b7c8a8f..48e920b 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -802,7 +802,56 @@
- + + + + + + + + + + + + + + + + + + 查询 +

+ {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} +

+ + +
+ + +
From 092698f720a42482d1dd575d33ef840b32c2bfff Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Wed, 3 Apr 2024 10:09:01 +0800 Subject: [PATCH 7/9] a --- .../realTimeMonitor/components/carouselChart.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue index 1259df2..1e77c38 100644 --- a/src/views/realTimeMonitor/components/carouselChart.vue +++ b/src/views/realTimeMonitor/components/carouselChart.vue @@ -1,7 +1,7 @@ +