From 81e071b3ec392e7b45c7d3f5e62963bd2570aaa4 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Tue, 29 Aug 2023 10:35:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=8D=E7=85=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Home.vue | 11 ++ src/components/common/Sidebar.vue | 10 +- .../components/setschedule.vue | 6 +- src/views/realTimeMonitor/index.vue | 122 ++++++++++-------- vue.config.js | 2 +- 5 files changed, 92 insertions(+), 59 deletions(-) diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue index 6762f4a..5465150 100644 --- a/src/components/common/Home.vue +++ b/src/components/common/Home.vue @@ -150,6 +150,14 @@ export default { .monitor-container { .sideBar { width: 200px; + .el-tree-node__content { + font-size: 10px !important; + } + .el-tree-node__children { + .el-tree-node__content { + padding-left: 8px !important; + } + } .radioFilter { .refresh { display: none; @@ -169,6 +177,9 @@ export default { } .thumb-example { height: calc(100% - 8px); + .radioBox { + top: -18px; + } .picTop { height: 70%; } diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index b906383..56e08f3 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -140,11 +140,11 @@ export default { }, ], }, - // { - // icon: "el-icon-setting", - // index: "/itOperation", - // title: "运维管理", - // }, + { + icon: "el-icon-setting", + index: "/itOperation", + title: "运维管理", + }, ], items1: [ { diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 917b7e3..9b34377 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -1235,9 +1235,13 @@ export default { this.newshedulenr = []; this.shedulenr = []; this.sureloading = false; - console.log("关闭轮询"); + this.compareloading = false; + + clearInterval(this.timer); clearInterval(this.timers); this.timers = null; + this.timer = null; + console.log("关闭轮询", "loading"); }, }, }; diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index aa27808..25e4f5a 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -306,7 +306,12 @@ title="配置参数" :visible.sync="videoVisible" > - + @@ -315,12 +320,13 @@ - - + +
@@ -353,7 +359,6 @@ import carouselChart from "../components/carouselChart.vue"; import setschedule from "./components/setschedule.vue"; import infoDialog from "./components/infoDialog.vue"; import gpsPosition from "./components/gpsPosition.vue"; -import { number } from "echarts"; export default { components: { previewContain, @@ -425,6 +430,12 @@ export default { time: "20", }, commondChannel: 1, + videorules: { + time: [ + { required: true, message: "时间不能为空" }, + { type: "number", message: "请输入正确的数字时间" }, + ], + }, }; }, watch: { @@ -809,6 +820,7 @@ export default { //主动拍照 handleCommandpic(command) { console.log(command); + this.clearfun(); getTermStatus({ termId: this.zztermId }).then((res) => { console.log(res); if (res.data.isonline) { @@ -845,8 +857,8 @@ export default { }, //主动拍视频 handleCommandvideo(command) { - console.log(command); - this.clearfun(); + // console.log(command); + // this.clearfun(); console.log(command); this.commondChannel = command; this.clearfun(); @@ -891,46 +903,52 @@ export default { }, anVideoFn(command) { - this.videoVisible = false; - getTermStatus({ termId: this.zztermId }).then((res) => { - console.log(res); - if (res.data.isonline) { - this.btnvideoloading = true; - console.log("拍摄视频通道" + command); - let params = [ - { - name: "act", - value: "capture", - }, - { - name: "channel", - value: command, - }, - { - name: "preset", - value: 255, - }, - { - name: "type", - value: 1, - }, - { - name: "stream", - value: this.videoForm.stream, - }, - { - name: "videoTime", - value: this.videoForm.time, - }, - ]; - this.setTermFn(params); - } else { - this.$message({ - duration: 1500, - showClose: true, - message: "装置下线，发送指令失败", - type: "error", + this.$refs[videoRef].validate((valid) => { + if (valid) { + this.videoVisible = false; + getTermStatus({ termId: this.zztermId }).then((res) => { + console.log(res); + if (res.data.isonline) { + this.btnvideoloading = true; + console.log("拍摄视频通道" + command); + let params = [ + { + name: "act", + value: "capture", + }, + { + name: "channel", + value: command, + }, + { + name: "preset", + value: 255, + }, + { + name: "type", + value: 1, + }, + { + name: "stream", + value: this.videoForm.stream, + }, + { + name: "videoTime", + value: this.videoForm.time, + }, + ]; + this.setTermFn(params); + } else { + this.$message({ + duration: 1500, + showClose: true, + message: "装置下线，发送指令失败", + type: "error", + }); + } }); + } else { + return false; } }); }, @@ -1025,11 +1043,11 @@ export default { // // console.log(this.i); if (res.data == true && this.i < 10) { console.log(res.data); - this.i = 0; - clearInterval(this.timer); - this.timer = null; this.btnpicloading = false; this.btnvideoloading = false; + console.log(this.i); + clearInterval(this.timer); + this.timer = null; this.getTerminalPhotoList( this.selectChannelValue, this.dateValue, @@ -1575,8 +1593,8 @@ export default { .el-dialog { width: 380px; } - .el-input-number { - width: 208px; + .el-input { + width: 214px; } } } diff --git a/vue.config.js b/vue.config.js index 2d81f4c..0c32024 100644 --- a/vue.config.js +++ b/vue.config.js @@ -29,7 +29,7 @@ module.exports = defineConfig({ proxy: { "/api": { //表示拦截以/api开头的请求路径 - //target: "http://47.96.238.157:8093", //阿里云服务器环境 + // target: "http://47.96.238.157:8093", //阿里云服务器环境 target: "http://180.166.218.222:40080", //dell changOrigin: true, //是否开启跨域 pathRewrite: {