From 4e33b94a91cfe38c5e2ba4732ed6103ff560f422 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Fri, 2 Jun 2023 08:54:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Sidebar.vue | 18 +++++------ src/views/components/carouselChart.vue | 16 ++++++++-- .../components/setdevice.vue | 20 ++++++++---- src/views/deviceUpgrade/index.vue | 6 ++-- .../components/pictureTags.vue | 2 +- src/views/realTimeMonitor/index.vue | 32 +------------------ 6 files changed, 41 insertions(+), 53 deletions(-) diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index bd34d94..cd36e91 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -69,11 +69,11 @@ export default { index: "/pictureRotation", title: "图片轮巡", }, - // { - // icon: "el-icon-bell", - // index: "photoAlarm", - // title: "告警处理", - // }, + { + icon: "el-icon-bell", + index: "photoAlarm", + title: "告警处理", + }, { icon: "el-icon-search", @@ -106,10 +106,10 @@ export default { index: "/devicePhotoSchedule", title: "拍照时间表设置", }, - // { - // index: "/deviceUpgrade", - // title: "装置升级", - // }, + { + index: "/deviceUpgrade", + title: "装置升级", + }, // { // icon: "el-icon-picture-outline", // index: "imageSettings", diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 9e781ff..337038c 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -29,7 +29,7 @@ class="showPic" @click="closePic" > -
+
@@ -190,9 +190,10 @@ export default { canvas: null, ctx: null, imgpic: null, - color: "#FF0000", + color: "#00ff00", num: 5, showBigpic: false, + flagline: true, }; }, mounted() { @@ -230,6 +231,11 @@ export default { closePic() { this.showBigpic = false; }, + openline() { + this.flagline = true; + console.log("11111111111111111111111111", this.flagline); + this.drawline(); + }, drawline() { this.canvas = this.$refs.myCanvas; this.imgpic = this.$refs.picJpg; @@ -239,6 +245,11 @@ export default { this.canvas.height = this.imgpic.offsetHeight; //设置画布大小 this.ctx = this.canvas.getContext("2d"); console.log(this.localPoints); + if (this.flagline == true) { + this.localPoints = this.localPoints; + } else { + this.localPoints = []; + } console.log(this.ctx); this.ctx.beginPath(); //设置线条颜色，必须放在绘制之前 @@ -262,6 +273,7 @@ export default { //不显示绘制线 handelClear() { this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); + this.flagline = false; }, getphotoList() { this.fiveList = this.terminalPhoto.slice( diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index 71f975c..3cdd019 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -65,13 +65,14 @@ :max="9" >
- +
+ + 下发中 + +
{{ data.name }} @@ -146,6 +147,7 @@ export default { termzzid: [], flag: false, sureloading: false, + showtag: false, }; }, mounted() {}, @@ -218,6 +220,7 @@ export default { submitForm() { //console.log(this.termidArr); this.sureSum(); + this.showtag = true; }, //时间表 sureSum() { @@ -280,6 +283,7 @@ export default { this.timer = null; this.isShow = false; this.sureloading = false; + this.showtag = false; } else if (this.i > 9) { this.zzerror = true; this.i = 0; @@ -287,6 +291,7 @@ export default { clearInterval(this.timer); this.timer = null; this.isShow = false; + this.showtag = false; this.sureloading = false; } }) @@ -303,6 +308,7 @@ export default { clearTimeout(this.timer); this.timer = null; this.sureloading = false; + this.showtag = false; }, }, }; diff --git a/src/views/deviceUpgrade/index.vue b/src/views/deviceUpgrade/index.vue index 12ddabd..ed4648c 100644 --- a/src/views/deviceUpgrade/index.vue +++ b/src/views/deviceUpgrade/index.vue @@ -29,9 +29,9 @@ diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue index 5b4ec4b..0d7c0b0 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue @@ -93,7 +93,7 @@ export default { ctx: null, imgpic: null, drawingSurfaceImageData: "", - color: "#FF0000", + color: "#00ff00", num: 5, flag: false, x: 0, diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 41df415..b47bb46 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -93,35 +93,11 @@ > -

操作项

- - 主动拍照 @@ -149,12 +125,6 @@ - - 装置信息 @@ -545,7 +515,7 @@ export default { handleCommandLine(command) { switch (command) { case "open": //开启 - this.$refs.carouselpic.drawline(); + this.$refs.carouselpic.openline(); break; case "close": //关闭 this.$refs.carouselpic.handelClear();