diff --git a/src/views/iceWeather/icing/index.vue b/src/views/iceWeather/icing/index.vue index 7129e4d..20fe3c8 100644 --- a/src/views/iceWeather/icing/index.vue +++ b/src/views/iceWeather/icing/index.vue @@ -930,7 +930,7 @@ export default { this.getIcingData(pullParams); } else if (this.termalFlag) { let pullParams = { - lineId: this.paramsData.lineid, + //lineId: this.paramsData.lineid, termId: this.paramsData.id, towerId: this.paramsData.towerid, start: sTime, diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index 53d27c6..fcaab46 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -8,7 +8,7 @@ @close="handleclose" >
- 装置编号：{{ rowData.cmdId || rowData.cmdid }} + 装置编号：{{ rowData.name }} 国网I1 陕西 @@ -25,7 +25,7 @@
- + + - + - + -->
-
-

装置复位

- 复位 +
+
+ + + + + + + + + + + 校时 + + + 查询 + 设置 +

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

+ + +
+
+
+ + + + + {{ item.name }} + （{{ item.title }}{{ item.uploadDate }}） + + + + + + （数据包长度默认32K,[1,32768]） + + + 确 定 +
+
+
+

装置复位

+ 复位 +
- +
@@ -882,95 +982,6 @@
- - -
@@ -1026,7 +1037,7 @@ export default { showLookTime: false, lookTime: "", //查询时间 isShow: false, - activeName: "1", + activeName: "2", timeLoading: false, nowTimesetLoading: false, timesetLoading: false, @@ -1211,7 +1222,7 @@ export default { console.log("视频采集参数"); this.$refs.videoCaptureref.getSingleAccess(this.rowData); this.$refs.videoCaptureref.getRatio(this.rowData); - } else if (tab.label == "升级") { + } else if (tab.label == "基本操作") { this.getUpgradeList(); } this.tabName = tab.label; @@ -2120,7 +2131,7 @@ export default { //时间 console.log(this.tabName); //this.devicenewtime = JSON.parse(res.data.data).timestamp * 1000; - if (this.tabName == "装置时间") { + if (this.tabName == "基本操作") { this.devicetime = JSON.parse(res.data.data).timestamp * 1000; console.log(this.devicetime); } @@ -2374,14 +2385,7 @@ export default { } .el-tabs__content { height: 436px; - .deviceTime { - width: 400px; - margin: 0 auto; - margin-top: 24px; - .el-input { - width: 200px; - } - } + .runform { width: 730px; margin: 0 auto; @@ -2398,6 +2402,28 @@ export default { width: 200px; } } + .basicBox { + display: flex; + justify-content: space-around; + .deviceTime { + width: 400px; + //margin: 0 auto; + border-right: 1px solid #eee; + margin-top: 24px; + .el-input { + width: 200px; + } + } + .queryParam { + width: 400px; + margin: 0 auto; + border-right: 1px solid #eee; + margin-top: 24px; + .el-input { + width: 200px; + } + } + } .queryParam { width: 400px; margin: 0 auto; @@ -2434,7 +2460,7 @@ export default { } } .el-input { - width: 136px; + width: 136px !important; } .info { font-size: 12px; diff --git a/src/views/realTimeMonitor/components/setAppDialog.vue b/src/views/realTimeMonitor/components/setAppDialog.vue index 568d4a2..a6a2d40 100644 --- a/src/views/realTimeMonitor/components/setAppDialog.vue +++ b/src/views/realTimeMonitor/components/setAppDialog.vue @@ -8,7 +8,7 @@ @close="handleclose" >
- 装置编号：{{ areaData.cmdid }} + 装置编号：{{ areaData.name }} 刷新 diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue index e008ea7..09b63e1 100644 --- a/src/views/realTimeMonitor/components/setChannelDialog.vue +++ b/src/views/realTimeMonitor/components/setChannelDialog.vue @@ -8,10 +8,14 @@ @close="handleclose" >
- 装置编号：{{ areaData.cmdid + 装置编号：{{ areaData.name }}刷新 + + 
{{ resultJson }}
+ 展示JSON +
@@ -119,31 +123,59 @@
- - + - - (毫秒) + (ms) + + (μs) + ({{ + this.channelForm.bgsj * 1000000 + + this.channelForm.expsTimeUs * 1000 + }}ns) +
+
+ + + + + + + + + +
-
+
- + +
+ + + +
+
+
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 19cc74f..99424e7 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -7,7 +7,7 @@ width="1000px" @close="handleclose" > -
装置编号：{{ areaData.cmdid }}
+
装置编号：{{ areaData.name }}
@@ -380,24 +380,27 @@ export default { console.log(hnarr[k].startTime); console.log(hnarr[k].endTime); console.log(hnarr[k].span); - let Stime = this.$moment(hnarr[k].startTime, "HH:mm").format( - "YYYY-MM-DD HH:mm:ss" - ); + if (hnarr[k].span !== 0) { + let Stime = this.$moment(hnarr[k].startTime, "HH:mm").format( + "YYYY-MM-DD HH:mm:ss" + ); - let Etime = this.$moment(hnarr[k].endTime, "HH:mm").format( - "YYYY-MM-DD HH:mm:ss" - ); - let spanTime = hnarr[k].span; + let Etime = this.$moment(hnarr[k].endTime, "HH:mm").format( + "YYYY-MM-DD HH:mm:ss" + ); + let spanTime = hnarr[k].span; - while ( - this.$moment(Stime).isBefore(this.$moment(Etime)) || - this.$moment(Stime).isSame(this.$moment(Etime)) - ) { - dayArr.push(Stime); - Stime = this.$moment(Stime) - .add(spanTime, "minute") - .format("YYYY-MM-DD HH:mm:ss"); + while ( + this.$moment(Stime).isBefore(this.$moment(Etime)) || + this.$moment(Stime).isSame(this.$moment(Etime)) + ) { + dayArr.push(Stime); + Stime = this.$moment(Stime) + .add(spanTime, "minute") + .format("YYYY-MM-DD HH:mm:ss"); + } } + // // 将结束日期的天放进数组 console.log(dayArr); } diff --git a/vue.config.js b/vue.config.js index 71e4f42..86367af 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,8 +23,8 @@ module.exports = defineConfig({ //表示拦截以/api开头的请求路径 //target: "http://192.168.1.190:8080", //190 需要去掉/Api - target: "http://61.169.135.146:9911/", //运维 覆冰 - // target: "http://61.169.135.146:40080/", //dell + // target: "http://61.169.135.146:9911/", //运维 覆冰 + target: "http://61.169.135.146:40080/", //dell //target: "http://192.168.50.198:8093", //java本机 changOrigin: true, //是否开启跨域 pathRewrite: {