diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index 626dfa7..48e920b 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -800,6 +800,148 @@ + +
+
+ + + + + + + + + + + + + + + + + + 查询 +

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

+ + +
+ + + +
+
取 消 @@ -992,6 +1134,21 @@ export default { ], }, upOptions: [], + //网络适配器 + //上位机信息 + inetComputer: { + ip: "", + subnetMask: "", + gateway: "", + dns: "", + phoneNumber: "", + }, + inetrulse: { + ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }], + port: [{ required: true, message: "请输入端口号", trigger: "blur" }], + }, + inetLoading: false, + inetSetLoading: false, }; }, mounted() {}, @@ -1132,6 +1289,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 +1915,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] --dns + 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: 31, + }, + { + 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 +2022,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 +2046,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 +2097,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 +2231,7 @@ export default { this.samplingForm = {}; this.deviceTimeForm = {}; this.upperComputer = {}; + this.inetComputer = {}; this.idParameter = {}; this.zjidParameter = {}; this.gpsForm = {}; @@ -1982,6 +2247,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; 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) => {}); 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; + }); + } }); }, //点击分页 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" /> + + 在线 + 离线 +
- {{ radioPx }} ({{ fileSize.toFixed(2) }}M) + {{ radioPx }} ({{ fileSize }}) 国网I1 陕西 安徽 @@ -391,10 +391,18 @@ export default { } else { this.radioPx = ""; } - if (data.fileSize != undefined) { - this.fileSize = data.fileSize / (1024 * 1024); + if (data.fileSize !== undefined) { + const sizeInBytes = data.fileSize; + const sizeInMB = sizeInBytes / (1024 * 1024); + const sizeInKB = sizeInBytes / 1024; + + if (sizeInMB >= 1) { + this.fileSize = `${sizeInMB.toFixed(2)}M`; // 大于等于1MB，以MB为单位，保留两位小数 + } else { + this.fileSize = `${sizeInKB.toFixed(2)}K`; // 小于1MB，以KB为单位，保留两位小数 + } } else { - this.fileSize = ""; + this.fileSize = ""; // 如果data.fileSize未定义，则设置为空字符串 } // console.log(data.channelId); diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index 3aadc6c..fb5c68e 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -310,7 +310,6 @@ export default { } else { this.formdata.lineid = Number(this.$route.query.lineId); } - this.getSearchgt(); }) .catch((err) => {}); diff --git a/src/views/towerInformation/index.vue b/src/views/towerInformation/index.vue index 9b20ef8..bea5c23 100644 --- a/src/views/towerInformation/index.vue +++ b/src/views/towerInformation/index.vue @@ -112,6 +112,11 @@ }} +