diff --git a/src/views/photographicDevice/components/imageCapture.vue b/src/views/photographicDevice/components/imageCapture.vue index 3ca2db9..90b2935 100644 --- a/src/views/photographicDevice/components/imageCapture.vue +++ b/src/views/photographicDevice/components/imageCapture.vue @@ -91,7 +91,7 @@ >查询

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

+ + + + (1025-65535) @@ -179,6 +186,7 @@ export default { bsManufacturer: "", // 生产厂家 productionDate: "", // 生产日期 workStatusTimes: 3, + reportFault: "", //故障上报 }, protocolOptions: [ { @@ -301,7 +309,7 @@ export default { }, { name: "configs", - value: 17, + value: 18, }, //装置通道数 { name: "name1", value: "channels" }, @@ -374,9 +382,13 @@ export default { { name: "value16", value: this.appForm.upgradePacketBase }, { name: "type16", value: 0 }, //工作状态报周期 - { name: "name1", value: "workStatusTimes" }, - { name: "value1", value: this.appForm.workStatusTimes }, - { name: "type1", value: 0 }, + { name: "name17", value: "workStatusTimes" }, + { name: "value17", value: this.appForm.workStatusTimes }, + { name: "type17", value: 0 }, + //工作状态报周期 + { name: "name18", value: "reportFault" }, + { name: "value18", value: this.appForm.reportFault ? 1 : 0 }, + { name: "type18", value: 0 }, ]; this.setTermFn(params); } else { @@ -535,6 +547,7 @@ export default { this.appForm.bsManufacturer = resultContent.bsManufacturer; // 生产厂家 this.appForm.productionDate = resultContent.productionDate * 1000; // 生产日期 this.appForm.workStatusTimes = resultContent.workStatusTimes; // 生产日期 + this.appForm.reportFault = resultContent.reportFault; // 故障上报 } else { this.appForm.channels = 4; //装置通道数,程序默认值为4 this.appForm.packetSize = 2048; //图像数据分包大小 @@ -554,6 +567,7 @@ export default { this.appForm.bsManufacturer = ""; // 生产厂家 this.appForm.productionDate = ""; // 生产日期 this.appForm.productionDate = 3; // 工作状态报周期 + this.appForm.reportFault = ""; // 故障上报 } this.$message({ @@ -607,6 +621,7 @@ export default { this.appForm.bsManufacturer = ""; // 生产厂家 this.appForm.productionDate = ""; // 生产日期 this.appForm.productionDate = 3; // 工作状态报周期 + this.appForm.reportFault = ""; // 故障上报 window.clearInterval(this.searchTimer); this.searchTimer = null; this.searchNum = 0; diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 4e27b0c..19cc74f 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -967,8 +967,10 @@ export default { .searchTime { .channelBox { margin-bottom: 12px; + display: flex; + align-items: center; .clearButton { - margin-left: 24px; + margin-left: auto; } } .timeContain {